- Improved messages and error handling
- Fixed formatting