fixes #5 (linebreak output) and minor nits