Made a few referential changes where I found errors