Functional Enrichment update

See commits for changes.