more report work
Merge branch 'josh_lincoln' into josh
some report formatting