more assumptions
slight fixes to constraints data structures