fixed internationalization and header issues