Polished UnitCombat and UnitMovement

Finished UnitCombat and UnitMovement