diff --git a/tools/cfar.sh b/tools/cfar.sh
index 1036c5f64020fd105627c2db2799f318bc1c43ba..5572ea122aeccb9cc6079eaed0a12937b6124078 100755
--- a/tools/cfar.sh
+++ b/tools/cfar.sh
@@ -31,10 +31,11 @@ do
 	sharepath_key="$seq:$variants:dir://$share_path "
 
 	# optoins for zipr's large_only plugin to help create non-overlapping code segments. 
-	large_only_options="--step-option zipr:--large_only:on --step-option zipr:true --step-option zipr:--large_only:variant --step-option zipr:$sharepath_key"
+	#large_only_options="--step-option zipr:--large_only:on --step-option zipr:true --step-option zipr:--large_only:variant --step-option zipr:$sharepath_key"
+	large_only_options="--step-option zipr:'--large_only:on true --large_only:variant $sharepath_key'"
 	
-	# optoins to p1 to create non-overlapping canary values.
-	p1options=" --step-option p1transform:--canary_value --step-option p1transform:0xFF0${seq}${seq}0FF --step-option p1transform:--random_seed --step-option p1transform:$anyseed "
+	# options to p1 to create non-overlapping canary values.
+	p1options=" --step-option p1transform:'--canary_value 0xFF0${seq}${seq}0FF --random_seed $anyseed'"
 
 	# invoke $PS.
 	cmd=" PGDATABASE=peasoup_${USER}_v$seq $zipr_env $PEASOUP_HOME/tools/ps_analyze.sh $in $out.v$seq $@ $p1options $large_only_options > variant_output.$seq 2>&1 &"
diff --git a/tools/ps_analyze.sh b/tools/ps_analyze.sh
index 3363ddcd6805c45c2bd67d9b44543af85cad4e96..9e184422289aa908232a1e8a618df34a5930efc9 100755
--- a/tools/ps_analyze.sh
+++ b/tools/ps_analyze.sh
@@ -241,7 +241,7 @@ check_options()
             			shift 2
 			;;
 			-o|--step-option)
-           			set_step_option $2
+           			set_step_option "$2"
             			shift 2
             		;;
             		# This is the watchdog value
@@ -692,7 +692,7 @@ shift
 #
 # finish argument parsing
 #
-check_options $*
+check_options "$@"
 
 
 #