Improvements

Prepare for release.