Re-committed a change and fixed a few typos.