Doc & comment updates, struct field updates