finish refactoring & missing translations