Made a couple changes to the output.