- Various fixes and improvements to balance handling