Fix type & add improve some translation