Small tweaks and fixes to Gatherings, export data