Comment cleanup (via Kay) and some debug messages