Enriched some comments