Adding handling for HTML tables in addition to CALS

Plus a few other elements.