Logging and Clean up

Some more debug logging, and comment clean up (no real changes)