Cleaned up some comments and debug messages