server: major code cleanup
Merge branch 'jump-mode'