Added interruption support.
Removed logger, some minor changes.