Finish off a lot more of v0.0.1