Equivalencies update, fixes TODO tags.
Equivalencies. Resolves #62.
Merge pull request #82 from MatthewJA/equivalencies

Equivalencies updates, resolves #62