Fixed spelling, classname, and such