other bugs fixed
other bugs fixed