Improve locales, fix headers