locales again and minor bugs