Address typos and cs issues.