Fixing some bugs with SIGINT handling.
Squashed a few typos/bugs.