finished
fix some bugs