other bugs fixed