Implemented Kick, some changes to punch