More cleanup.  Added visual-regexp and show-marks.