Minor changes and balancing attempts