Another check; doc updates; cleanup.