Add dir jump and some cleanup.