just comments fixed