Fix typos and resolve comments.