Increased robustness and error handling and reporting.
Added recover step.
Small bugfixes.
Improved propagation of settings.