other bugs corrected