norminette and some fixes