polishing in prep for 2.0.0-RC1 release