Various cleanup and spelling fixes.