updates and cleanups

The commits tell the tale.  Prepping for 1.0 release.