Removed all references to summary table, fixed up copying errors