Printing now includes substitution.
Fixed wh-question returning some wrong answers. Minor changes to cancel-infer.