General updates in prep for 2.0.0 alpha release