Restructured tables, added charts/graphs