Fix a bunch of things
0.0.3