Internationalization and improvements