Various changes for 0.2.0