A few minor changes and bug fixes
- System for line break fixing and more