More Bugfixes, Optimization