major cleanup and version bump to 0.10.0