Minor changes, move and attack in one script