Add very partial support for tables, plus labels/captions