Fixed up quotes around text fields and added null/not null to boolean fields