recovery: diff stub, cleanups and logging