diff --git a/src/lexer.py b/src/lexer.py
index b04c224..9269f0d 100644
--- a/src/lexer.py
+++ b/src/lexer.py
@@ -19,7 +19,7 @@ tokens = [
 
 # STR needs to be the first one to catch
 def t_STR(t):
-    r"\"[^\"]+\" "
+    r"\"[^\"]+\""
     return t
 
 
@@ -86,7 +86,7 @@ def t_BOOL(t):
 
 # ID needs to be the last so it doesnt catch everything (literally)
 def t_ID(t):
-    r"[\w.]+"
+    r"[\w_]+(\.[\w_]+)*"
     return t