Various changes

More refactoring, updating translations etc.