table and fixes
syntx errors and merge