fixed some other bugs