More comments, fix test, update based on review.