i18n

Internationalization support
bug fixes