Added internationalization and some other stuff