Simplifies/correct some code
Corrects the attack/move glitch & simplifies code