Updated melee animator and control