correcting few bugs