Added missing translations
Cleaned up