Lotsa updates in preparation for beta release.