Fix some basic stuff
0.2.0