deliveryServices export in options.php; several fixes.