other bugs fixeds.