fix names & typos