Pulling in some of Laurence's changes.
Polishing up the release.