Some improvements and a drupal upgrade to 7.32