comments fixed!