jump and move - some more fixes