major upgrades, added multilanguage suport