resolve all typos