Further improvements to the drupal and drush modules