resolving few bugs