Fixed misspellings and changed some names