More cleanup. Improved run scripts.