Bugfixes, attempted extra functionality, gave up

Newlines not supported