#3 adding a few more fixes to improve translation to pt