- Update translations
- Better error handling
