More drupal_attributes, handle linking and dates and structured data better.