comments fixed up