several changes and options added in prep for 2.0 release