Enlarge unit to correct size in renderer
Decrease size of selecting ring to unit size
Of all things that could have merge conflicts, it's the commenting