few bugs with comments fixed