Fixing translation config and code tidy