More comments and tests.