Fix null: false spacing and add validations