Trivial changes to output format, fixes #2