Updated translation and bug fixes