Some progress on fixing the translator