String translation management, minor changes