Implemented review comments including adding checks for multi fields, and norms