working
fix issues and remove recoverable