Basic table support and bug fixes