Ctrl c improvements last

Now we got to the behavior we wanted with Ctrl+C