Added jumping, refactored, fixed various bugs