Mostly fixed typos