Changes to the printing and some formatting changes