Cleaned it up some

Removed bad comment lines
Added equation display code
It now outputs things.

I can't believe this worked.
Merge remote-tracking branch 'origin/master' into SwilsonBranch