Added some comments and cleaned up some debug code.