More definition around the unit types, close range attacks, and some static analysis induced clean up