Updated docs and minor output formatting changes