Add comments and equals/hashcode.