5 files changed, 20 insertions, 11 deletions
diff --git a/std/Math.bruijn b/std/Math.bruijn
index d9a8c5e..58da709 100644
--- a/std/Math.bruijn
+++ b/std/Math.bruijn
@@ -145,7 +145,7 @@ arrow z [[[[rec]]]] ⧗ Number → Number → Number → Number
 
 # fibonacci sequence
 # TODO: faster fib?
-fibs head <$> (iterate [~0 : (^0 + ~0)] ((+0) : (+1))) ⧗ (List Number)
+fibs head <$> (iterate &[[0 : (1 + 0)]] ((+0) : (+1))) ⧗ (List Number)
 
 fib [fibs !! ++0] ⧗ Number
 
diff --git a/std/Number/Binary.bruijn b/std/Number/Binary.bruijn
index fcbe264..a056538 100644
--- a/std/Number/Binary.bruijn
+++ b/std/Number/Binary.bruijn
@@ -348,7 +348,7 @@ compare-case [[[(T.compare-case 2 1 0) ⋔ binary→ternary]]] ⧗ a → b → c
 
 # returns 1 if a>b, -1 if a<b and 0 if a=b
 # also: spaceship operator
-compare compare-case (+0) (+1) (-1) ⧗ Binary → Binary → Binary
+compare compare-case (+0) (+1) (-1) ⧗ Binary → Binary → Number
 
 :test (compare (+2b) (+2b)) ((+0))
 :test (compare (+2b) (+1b)) ((+1))
diff --git a/std/Number/Ternary.bruijn b/std/Number/Ternary.bruijn
index f63d9ac..20a89e8 100644
--- a/std/Number/Ternary.bruijn
+++ b/std/Number/Ternary.bruijn
@@ -59,11 +59,11 @@ t⁰? [0 false false true] ⧗ Trit → Boolean
 :test (↑⁰(+42)) ((+126))
 
 # shifts a specified trit into a balanced ternary number
-up [[[[[[5 2 1 0 (4 3 2 1 0)]]]]]] ⧗ Trit → Number → Number
+…↑… [[[[[[5 2 1 0 (4 3 2 1 0)]]]]]] ⧗ Trit → Number → Number
 
-:test (up t⁻ (+42)) (↑⁻(+42))
-:test (up t⁺ (+42)) (↑⁺(+42))
-:test (up t⁰ (+42)) (↑⁰(+42))
+:test (t⁻ ↑ (+42)) (↑⁻(+42))
+:test (t⁺ ↑ (+42)) (↑⁺(+42))
+:test (t⁰ ↑ (+42)) (↑⁰(+42))
 
 # infinity
 # WARNING: using this mostly results in undefined behavior! (TODO?)
@@ -249,7 +249,7 @@ dec [~(0 z a⁻ a⁺ a⁰)] ⧗ Number → Number
 add [[abs 1 →^0]] ⧗ Number → Number → Number
 	abs [c (0 z a⁻ a⁺ a⁰)]
 		b⁻ [1 ↑⁺(3 0 t⁻) ↑⁰(3 0 t⁰) ↑⁻(3 0 t⁰)]
-		b⁰ [up 1 (3 0 t⁰)]
+		b⁰ [1 ↑ (3 0 t⁰)]
 		b⁺ [1 ↑⁰(3 0 t⁰) ↑⁻(3 0 t⁺) ↑⁺(3 0 t⁰)]
 		a⁻ [[[1 (b⁻ 1) b⁻' b⁰ b⁻]]]
 			b⁻' [1 ↑⁰(3 0 t⁻) ↑⁻(3 0 t⁰) ↑⁺(3 0 t⁻)]
diff --git a/std/Option.bruijn b/std/Option.bruijn
index 20e4a19..257b5f8 100644
--- a/std/Option.bruijn
+++ b/std/Option.bruijn
@@ -28,7 +28,7 @@ map [[0 none [some (2 0)]]] ⧗ (a → b) → (Option a) → (Option b)
 :test (map [[1]] none) (none)
 
 # applies a function to the value in option or returns first arg if none
-map-or v ⧗ (a → b) → (Option a) → (Option c)
+map-or v ⧗ a → (b → c) → (Option b) → c
 
 :test (map-or [[[2]]] [[1]] (some [[0]])) ([[[0]]])
 :test (map-or [[[2]]] [[1]] none) ([[[2]]])
diff --git a/std/String.bruijn b/std/String.bruijn
index 76121ee..5af9574 100644
--- a/std/String.bruijn
+++ b/std/String.bruijn
@@ -29,17 +29,26 @@ ni? \in? ⧗ String → Char → Boolean
 :test ("ab" ∋ 'c') (false)
 
 # converts a string of digits into a number
-string→number from-digits ∘ (map C.char→number) ⧗ String → Number
+string→unsigned-number from-digits ∘ (map C.char→number) ⧗ String → Number
 
-:test (%(string→number "123")) ((+123))
+:test (%(string→unsigned-number "123")) ((+123))
 
 # converts a signed string of digits into a number
-string→signed-number [(sign ^0) (string→number ~0)] ⧗ String → Number
+string→signed-number [(sign ^0) (string→unsigned-number ~0)] ⧗ String → Number
 	sign [(B.eq? 0 '-') -‣ i]
 
 :test (%(string→signed-number "+123")) ((+123))
 :test (%(string→signed-number "-123")) ((-123))
 
+# converts signed/unsigned number strings to a number
+string→number [C.les? ^0 '0' signed unsigned] ⧗ String → Number
+	signed string→signed-number 0
+	unsigned string→unsigned-number 0
+
+:test (%(string→number "123")) ((+123))
+:test (%(string→number "+123")) ((+123))
+:test (%(string→number "-123")) ((-123))
+
 # converts a number to a string
 number→string (map C.number→char) ∘ digits ⧗ Number → String