diff --git a/src/parser/stage/tokenize.rs b/src/parser/stage/tokenize.rs
index 470631d..f2b4b9c 100644
--- a/src/parser/stage/tokenize.rs
+++ b/src/parser/stage/tokenize.rs
@@ -123,7 +123,9 @@ pub fn tokenize(input: &String) -> VecDeque<Token> {
 						}
 					},
 
-					// This may be a negative or a subtraction
+					// This may be a negative or a subtraction.
+					// Multi-character operators with - and + are NOT supported!
+					// (for example, we can't use -> for unit conversion)
 					_ => {
 						push_token(&mut g, t, i);
 						t = Some(Token::Operator(
@@ -136,7 +138,9 @@ pub fn tokenize(input: &String) -> VecDeque<Token> {
 
 			// Operator
 			'*'|'×'|'/'|'÷'|
-			'^'|'!'|'%'|'='
+			'^'|'!'|'%'|'='|
+			'>'|'<'|'?'|'@'|
+			'&'|'|'|'~'|'\\'
 			=> {
 				match &mut t {
 					Some(Token::Operator(_, val)) => { val.push(c); },