locale combo improvements
undeclared var fix