Internationalization initial changes + bug fixes