Picat: some old uncommitted changed, and some new models