minor fixes (comments and DEBUG msgs)