Added I18N plugin, and some minor fixes