Fix typos and handle SIGINT a little better.