Attack highlight and fixes to movement