Translation improvements and bug fix.