Updated Code

Cleaned up a metric ton of code, and fixed jumping (flicker included!).