Some small performance improvements. Need more :(
Finished with performance optimization - now know what to do.