trailing whitespace and small additions to json