applied Jeroen's {clean,spell}.diff patches, thanks Jeroen!