Minor comment and debug output changes.