diff --git a/indent/nomsu.vim b/indent/nomsu.vim
index 19342cb..9282e50 100644
--- a/indent/nomsu.vim
+++ b/indent/nomsu.vim
@@ -10,7 +10,7 @@ let b:did_indent = 1
 
 setlocal autoindent
 setlocal indentexpr=GetNomsuIndent()
-setlocal indentkeys+=0],0),1)
+setlocal indentkeys+=0],0),1),1.
 
 " Only define the function once.
 if exists("*GetNomsuIndent")
@@ -30,7 +30,7 @@ function! GetNomsuIndent()
   endif
 
   " TODO: dedent to matching parens, don't just dedent once
-  if line =~ '^\s*\%([\])}]\|")\)'
+  if line =~ '^\s*\%([\])}]\|")\|\.\.\)'
     "let ind -= &tabstop
     return current_ind - &tabstop
   endif
diff --git a/syntax/nomsu.vim b/syntax/nomsu.vim
index 2d6f51c..222512a 100644
--- a/syntax/nomsu.vim
+++ b/syntax/nomsu.vim
@@ -15,9 +15,6 @@ hi nomsuInterpDelim ctermfg=Gray
 "syn region nomsuOneLineComment start=/#/ end=/$/
 "hi nomsuOneLineComment ctermfg=DarkBlue
 "hi def link nomsuOneLineComment Comment
-syn region nomsuComment start=/\%(^\z(\s*\)\)\@<=#/ skip=/\n\s*$/ end=/\n\%(\z1\s\)\@!/
-hi nomsuComment ctermfg=DarkBlue
-hi def link nomsuComment Comment
 
 syn region nomsuList start=/\[/ end=/\]/ contains=@nomsuAll
 hi nomsuList ctermfg=Blue
@@ -70,14 +67,14 @@ hi nomsuVarParens ctermfg=LightCyan
 syn match nomsuWord /\%([a-zA-Z_]\|[^\x00-\xff]\)\%([a-zA-Z0-9_]\|[^\x00-\xff]\)*/
 hi def link nomsuWord Function
 hi nomsuWord ctermfg=White
-syn match nomsuOpWord ;[`~!@^&*_+=<>?'/-]\+\|\%(^\s*\)\@<!#;
+syn match nomsuOpWord ;[`~!|%#@^&*_+=<>?'/-]\+\|\%(^\s*\)\@<!#;
 hi def link nomsuOpWord Function
 hi nomsuOpWord ctermfg=LightYellow
 
 syn match nomsuVarWord /\%([a-zA-Z_]\|[^\x00-\xff]\)\%([a-zA-Z0-9_]\|[^\x00-\xff]\)*/ contained
 hi def link nomsuVarWord Function
 hi nomsuVarWord ctermfg=LightCyan
-syn match nomsuVarOpWord ;[`~!@^&*_+=<>?'/-]\+\|\%(^\s*\)\@<!#; contained
+syn match nomsuVarOpWord ;[`~!|%#@^&*_+=<>?'/-]\+\|\%(^\s*\)\@<!#; contained
 hi def link nomsuVarOpWord Function
 hi nomsuVarOpWord ctermfg=LightCyan
 
@@ -112,6 +109,10 @@ syn match nomsuSemicolon /;/
 hi nomsuSemicolon ctermfg=Blue
 hi def link nomsuSemicolon Delimiter
 
+syn region nomsuComment start=/\%(^\z(\s*\)\)\@<=#/ skip=/\n\s*$/ end=/\n\%(\z1\s\)\@!/
+hi nomsuComment ctermfg=DarkBlue
+hi def link nomsuComment Comment
+
 syn cluster nomsuExpr contains=nomsuParenGroup,nomsuText,nomsuIndentedText,nomsuVar,
             \nomsuActionVar,nomsuNumber,nomsuDict,nomsuList,nomsuIndentedBlock