Bug fixes
new feature: equivalence
Bug fixes
Rename and simplify