Lots of tweaks as we enter the beta and first public release version.