fixes + translation