Tweaks
- Number formatting
- Cleanup
- Fix unicode issues