diff --git a/libwccl/parser/grammar.g b/libwccl/parser/grammar.g
index beab75531fb73493b4e1dc24ed3870c3e1c38b65..a4ac6c4a554ad3f4da89b82cacbb7a519c7d2f92 100644
--- a/libwccl/parser/grammar.g
+++ b/libwccl/parser/grammar.g
@@ -1190,12 +1190,14 @@ options {
 	k              = 2;
 }
 
+
+// TODO
 STRING
 options {
 	paraphrase = "a string";
 }
-	: '"'! (~'"')* '"'!
-	| '\''! (~'\'')* '\''!
+	: '"'!  (~('"'  | '\n' | '\r'))* '"'!
+	| '\''! (~('\'' | '\n' | '\r'))* '\''!
 ;
 
 SIGNED_INT
@@ -1336,15 +1338,14 @@ options {
 
 WS
 	: ( ' '
-	  | '\t'
-	  | '\f'
-	  | ( "\r\n"
-		| '\r'
-		| '\n'
-		)
-		{ newline(); } 
-	)
-	{ $setType(antlr::Token::SKIP); } 
+	  	| '\t'
+	  	| '\f'
+	  	| 
+			( "\r\n"
+				| '\r'
+				| '\n'
+			) { newline(); } 
+		) { $setType(antlr::Token::SKIP); } 
 ;
 
 COMMENT