Fix incorrect json types and values. Added a jsonType field to DataType and used it more.