avoid Ctrl+C wac death

sorry I mixed in many commits (first time messing with rebase xD)
Anyway, take from this what you will or nothing, whichever :)