Replace nulls with -- in profile. Messy code, plz refactor
Slight cleanup of Aggregations. Still needs refactoring