more cleanup and frozen 0.3.0 api changes