fix up CLI
add target and base facts
redo in python
comments