restored string table + a few more fixes