Fixed some bugs with collision detection and jumping
New level, and related tweaks