clean up, polish, final tweaks before 3.0 release