fix remaining jumps, clean up