Group translations and bugfixes