mostly syntax and commenting fixes