Change many figures to tables, lots of other fixes