- Better type
- Misc typos