fix other bugs