More cleanup and spelling fixes.