improve/bugfix translator