- Improve feedback to the user
- Some optimizations
- Minor corrections