Fixed a bunch of stuff 0.3.0