fix some bugs
fix other bugs