Cleaner interruptions.
Other minor changes