Various cleaning and work on aggregates and age_structure