Make the rest of the code consistent 

Barring anything I missed, this probably closes #204.

Besides the examples that need going through, and the TODOs, I saw a few public functions that should really be private and some commented out code.

I'll probably go through that too in the future.