few bug correction