fixed missing translations + some minor refactoring