Additional bugfixes and balancing