Add evil-jumper
Misc changes