fix/factorize agg_partials + fix past data