Whitespace/formatting, plus add Notes metadata field to XML