Fixes, clarifications, cleanup.