bugfix, refactoring and norm validation