first attempt to fix tables
minor table fix
some additions to context