Comment and few bugs fixed