Even better qa-table, small fixes