all tables and figures cleaned up