Update tables, and some figures