Some bugfixes and optimizations