fix some little error
fix some bugs