Latest changes before release.

I think I covered everything we talked about. I think it would be good if you could review the code.