Corrections for release.
More corrections