Tweaked jumping stuff
Merge branch 'myswamp'