More cleanup on exit handling. Exit on ^Z