a few bug was fixed