added punch anim and refactored scaling