More table improvements