fixed some id's. done for now