Escape to quit

Cleaned up jump code and made it less stupid