More changes, getting close to a public beta release