converted the rest of the constraints to the new format, still have some work to do in generallizing them though