Some minor cleaning up.
Made some bits of our 0.1 branch on par with our master branch.