Complete figure to table conversion; other cleanups