some imporvements to reporting