s
fix some bugs