More comments & tests.