Bug fixes and balancing