a bit more cleanup, and enabling Drupal object