Language cleanup and a few typos