More tweaks, features, and cleaning.  Fixed readme.