Quite a few changes: prettyprinting two possible solutions computed in the wildcard mode; plus refactoring and some bug fixes.