Fixed a ccouple of bugs and also pull Drupal version from buildthat