Fix reporting some totals so they are correct.
Added column for showing number of each school in type breakdown.