more linebreaks, beautify and fix #258