Changed a faulty CRef type to a TODO string
Made match-Instruction no longer change the term it succeeds on. Improved constraint collection