Bugfixes and Performance