fixing bugs
other bugs