Misc. Cleanup
Add ability to control line width