Remove new line hack now that buffer is in place
Add section on modules