translations corrected, code refactoring in progress