Tweaks to many sections of report up to baseline estimator