Minor fixes.
Almost done.