SCAN doc, more fixes.