fix and optimize most of the EnrichOps