Bug fixed: filtered pairs, plus some enhancements
Some more refactoring/commenting
Model State holds a list of Ind substitutions
NOT WORKING: We need to implement blocking