Fix naming withheld table. Add a commandline option to upgrade script.