Improved: jumping
Code cleanup.
Code cleanup.