update guidelines, mostly adjusting cardinality; reorganize some fields