diff -ruN sks-1.0.10-old/decode.ml sks-1.0.10/decode.ml
--- sks-1.0.10-old/decode.ml	2005-08-24 15:58:23.000000000 +0000
+++ sks-1.0.10/decode.ml	2006-04-21 23:11:09.000000000 +0000
@@ -157,7 +157,7 @@
 
 let rand_ZZp () = 
   let primebits = Nx.nbits !ZZp.order in
-  let random = Nx.random_bits primebits in
+  let random = Nx.nrandom primebits in
   ZZp.of_N random
 
 let factor_check x = 
diff -ruN sks-1.0.10-old/zZp.ml sks-1.0.10/zZp.ml
--- sks-1.0.10-old/zZp.ml	2005-08-24 15:58:24.000000000 +0000
+++ sks-1.0.10/zZp.ml	2006-04-21 23:10:59.000000000 +0000
@@ -51,14 +51,14 @@
 let to_N x = x
 let of_N x = modulo x !order
 
-let add x y = modulo (x + y) !order
-let mul x y = modulo (x * y) !order
-let mult x y = modulo (x * y) !order
+let add x y = modulo (x ++ y) !order
+let mul x y = modulo (x ** y) !order
+let mult x y = modulo (x ** y) !order
 let imult x y = modulo (Nx.mul_1 x y) !order
 
-let add_fast x y = (x + y) 
-let mul_fast x y = (x * y) 
-let mult_fast x y = (x * y) 
+let add_fast x y = (x ++ y) 
+let mul_fast x y = (x ** y) 
+let mult_fast x y = (x ** y) 
 let canonicalize x = modulo x !order
 
 let shl x i = Nx.shl x i
@@ -72,8 +72,8 @@
   if x = zero then raise (Invalid_argument "ZZp.inv: Attempt to invert 0");
   let (u,_,_) = Nx.gcd_ex x !order in modulo u !order 
 
-let div x y = modulo (x * (inv y)) !order
-let sub x y = modulo (x - y) !order
+let div x y = modulo (x ** (inv y)) !order
+let sub x y = modulo (x -- y) !order
 
 let lt x y = Nx.inf x y
 let gt x y = Nx.sup x y
@@ -86,7 +86,7 @@
 
 let points n = 
   Array.init n ~f:(fun i -> 
-		     let ival = ((i +! 1) /! 2) *! (if i mod 2 = 0 then 1 else (-1))
+		     let ival = ((i + 1) / 2) * (if i mod 2 = 0 then 1 else (-1))
 		     in Nx.of_int ival)
 
 let svalues n = 
@@ -131,7 +131,7 @@
 let add_el_array ~points el = 
   Array.init (Array.length points) 
     ~f:( fun i -> 
-	   let rval = modulo (points.(i) - el) !order in
+	   let rval = modulo (points.(i) -- el) !order in
 	   if rval = zero 
 	   then failwith "Sample point added to set"
 	   else rval )
@@ -139,15 +139,15 @@
 let del_el_array ~points el = 
   Array.init (Array.length points) 
     ~f:( fun i -> 
-	   let rval = inv (points.(i) - el) in
+	   let rval = inv (points.(i) -- el) in
 	   if rval = zero 
 	   then failwith "Sample point added to set"
 	   else rval)
 
 let mult_array ~svalues array =
-  if Array.length svalues <>! Array.length array 
+  if Array.length svalues <> Array.length array 
   then raise (Invalid_argument "ZZp.add_el: array lengths don't match");
-  for i = 0 to Array.length array -! 1 do 
+  for i = 0 to Array.length array - 1 do 
     let v = svalues.(i) in
     mult_in v ~~v array.(i)
   done
@@ -156,20 +156,20 @@
 (* Element-based functions for adding elements to svalues *)
 
 let add_el ~svalues ~points el = 
-  if Array.length svalues <>! Array.length points 
+  if Array.length svalues <> Array.length points 
   then raise (Invalid_argument "ZZp.add_el: array lengths don't match");
-  for i = 0 to Array.length points -! 1 do 
+  for i = 0 to Array.length points - 1 do 
     let v = svalues.(i) in
-    mult_in v ~~v (points.(i) - el)
+    mult_in v ~~v (points.(i) -- el)
   done
 
 (* needs checking *)
 let del_el ~svalues ~points el = 
-  if Array.length svalues <>! Array.length points 
+  if Array.length svalues <> Array.length points 
   then raise (Invalid_argument "ZZp.del_el: array lengths don't match");
-  for i = 0 to Array.length points -! 1 do 
+  for i = 0 to Array.length points - 1 do 
     let v = svalues.(i) in
-    div_in v ~~v (points.(i) - el)
+    div_in v ~~v (points.(i) -- el)
   done
 
 let array_mult x y =