v0.0.7.2

Bug fixes, clean up.