few bug resolved