ID use, some other bugs