a few bug removed