Minor improvements.
Interruption handling improved.