commenting fixes