Added some more suggestions for debugging code, also did some code
re-formatting.