Fixed bugs in substition
Replaced Equiv op by Coerce; Parses equivalence types