Further localization work
Merge branch 'localization'