Add Vietnamese and French; plus minor changes