diff --git a/runtime/syntax/lua.yaml b/runtime/syntax/lua.yaml
index 3ee256e1..cb1ee24e 100644
--- a/runtime/syntax/lua.yaml
+++ b/runtime/syntax/lua.yaml
@@ -18,11 +18,12 @@ rules:
     - identifier: "coroutine\\.\\b(create|isyieldable|resume|running|status|wrap|yield)\\b"
     - identifier: "debug\\.\\b(debug|getfenv|gethook|getinfo|getlocal|getmetatable|getregistry|getupvalue|getuservalue|setfenv|sethook|setlocal|setmetatable|setupvalue|setuservalue|traceback|upvalueid|upvaluejoin)\\b"
     - identifier: "bit32\\.\\b(arshift|band|bnot|bor|btest|bxor|extract|replace|lrotate|lshift|rrotate|rshift)\\b"
-    - identifier: "\\:\\b(close|flush|lines|read|seek|setvbuf|write)\\b"
+    - identifier: "\\:\\b(close|flush|lines|read|seek|setvbuf|write|byte|char|dump|find|format|gmatch|gsub|len|lower|match|pack|packsize|rep|reverse|sub|unpack|upper)\\b"
+    - identifier: "\\b(self|arg)\\b"
     - constant: "\\b(false|nil|true)\\b"
     - statement: "(\\b(dofile|require|include)|%q|%!|%Q|%r|%x)\\b"
     - constant.number: "\\b([0-9]+)\\b"
-    - symbol: "(\\(|\\)|\\[|\\]|\\{|\\}|\\*\\*|\\*|/|%|\\+|-|\\^|>|>=|<|<=|~=|=|\\.\\.|#)"
+    - symbol: "(\\(|\\)|\\[|\\]|\\{|\\}|\\*\\*|\\*|/|%|\\+|-|\\^|>|>=|<|<=|~=|=|[\\.]{2,3}|#)"
 
     - constant.string:
         start: "\""
@@ -50,11 +51,12 @@ rules:
         start: "\\-\\-\\[(\\=*|\\#*)\\["
         end: "\\-\\-\\](\\=*|\\#*)\\]"
         rules:
-            - todo: "(TODO|XXX|FIXME):?"
+            - todo: "(TODO|NOTE|FIXME):?"
 
 # this has to go after block comment or block comment does not work
 
     - comment: 
         start: "\\-\\-"
         end: "$"
-        rules: []
\ No newline at end of file
+        rules:
+          - todo: "(TODO|NOTE|FIXME):?"