Preparation for release.
Minor clean-ups.