more improvements ... do drupal outside puppet