Moore, language, minor fixes.