Few bug fixes, performance optimizations