language improved
intl working, testing almost done