broken comments fixed