translation highlighting and bugfixes