Correct a name and some other minor aesthetic changes.