fixed some formatting and i18n issues