minor changes - commit before changing language support to I18n