added enrichment functions, added formatting for raw data