Cleanups and doc fixes.