Typos and cleanup.