another table and some upgrade fixes

another table and some upgrade fixes