Table names are now stored in variables
Fixed table overflow bug