Add history stuff
Fix jumphost