Tweaked jump animation
merged stuff