More equivalency stuff
Cleaned stuff up
Lots of improvements