Performance Improvements, Bugfixes