Replaced old broken imports, ported makeTable to Python3