Good idea on short jumps - for some reason not thought of actually doing this, so done now, along with other fixes and additions
