Fix double-linking issue (I think) by simplifying builds/ structure.
Unsat cores.
More, circuit prop etc.
post-merge fix-ups