test
fix some bugs