Do 952g, and add comments for more fields