Fixed a few glaring flaws.

Also fixes #83 :)