Drupal tweaks

This is my first branch with changes that we need for the Drupaling. Let's see if this works....