Fixed a ton of bugs.
Merge pull request #11 from fox-squirrels-2013/bug_fixin

Fixed a ton of bugs.