change few bugs