some small fixes + cleaned up UnitManager controller