implemented a couple more ideas re internationalization