various tweaks and drupal mods for OIP