recovery: updates and cleanup