Better jumping, fixed some bugs