Random non-functional fixes

header errors, misspelled names, etc.