* Added a few more stability and performance improvements