Fix doc, concepts. Minor code fixes.