fix more line break and formatting issues

I don't see any bugs right now. Syntax highlighting needs to be added