recovery: diff stub, cleanups and logging
recovery: simplified error reporting