fixed stuff about adding class ids and stuff