fix tables and add some to performance