Update to 0.0.2, minor cleanup