Merge documentation and updates to constraints