Further improvements to the drush and drupal modules