the remaining gametracer changes for the agg branch