Code cleanup.
Fixed the jump glitch.
Improved some micro-level planning.