Report 2005: Add env 2 data, update 3n-hsw comp tables