fix some bugs
fix come bugs