v0.2

All functionality in, a little bit of prettifying as well.