Equivalencies update, fixes TODO tags.
Equivalencies. Resolves #62.