Minor changes to output object.
Changes to output and docs reflect it.