Added human-readable headers, and called out the custom types.