cleaned code a bit

Fiddled with the unit drawer and cleaned up some stray code