Updates.

And fixes.