recovery of warehouse project and fixes

recovery of warehouse project and fixes