0.2.0 fixes... more to come