More detailed comments, update test.