- Added extra safeguards restore
- Fixed some bugs
- Cleaning