Updates to output and documentation