messed with many of the constraint issues.  Still some random ones I don't know what's going on but they show errors in the run debugger
merge