some comments fixed