Added Ctrl-C handling back in to places.