few bugs update