Some debugging and formatting changes
Some debugging and formatting changes #2