Fixed a bunch of stuff, 1.0.1 is nearly complete