Fixed movement bug where adjacent units were unable to attack each other...

.... Fixed issues with combat system not deleting old units.