some major fixups to enrichment parameters