Improvements to UnitRenderer