Mostly refactoring

Implemented word-wrapping (No word splitting).
Renamed a few things.