Cabalize

I had to install Cbaal 1.21 to make thinsg work
Checkpoint:  things compile again.
Fix makefile
Mostly debugging
Don't generate duplicate facts