Cleanup time! First of several commits.

Also a broken commit. This is just to keep the work in small stages.
This commit contains changes for the update loop and improving jump().