Fixed errors

Cleaned up some of the Unit class before going to bed :P