Table OK; small fixes