fixing more stuff with id's