Cleaning up all the things.
Merge pull request #1 from jmatth/fix_stuff

Cleaning up all the things.