i18n cleanup and fixes

Use better strings in various places