Translation improvements and bug fixes