Internationalization and minor enhancements