fix tables more