a bunch of tweaks
Release 0.0.7