More Balancing/Bugfixes