further commenting fixes