spelling errors and such
merged