few bug modification