updated TODO
minor cleanings and listing symbols in order of appearance in previous expressions