diff --git a/syntax/nomsu.vim b/syntax/nomsu.vim
index 289968b..2d6f51c 100644
--- a/syntax/nomsu.vim
+++ b/syntax/nomsu.vim
@@ -36,7 +36,8 @@ syn match nomsuTextEscapedBackslash /./ contained
 hi nomsuTextEscapedBackslash cterm=bold ctermfg=Blue
 syn match nomsuTextEscape /\\\%(\x\{1,3}\|x\x\{1,2}\|.\)/ contains=nomsuTextEscapedChar contained
 hi nomsuTextEscape ctermfg=Gray
-syn match nomsuInterp /\\\%([[{($:]\)\@=/ nextgroup=nomsuVar,nomsuList,nomsuDict,nomsuParenGroup,nomsuIndentedInterpBlock contained
+syn match nomsuInterp /\\\%([[{($:]\)\@=/ 
+\           nextgroup=nomsuActionVar,nomsuVar,nomsuList,nomsuDict,nomsuParenGroup,nomsuIndentedInterpBlock contained
 hi nomsuInterp ctermfg=Gray
 syn region nomsuInterpDotDot matchgroup=nomsuInterpDelim start=/\\\s*$/ end=/\.\./ contained
 hi nomsuInterpDotDot ctermfg=Gray
@@ -45,7 +46,7 @@ syn region nomsuIndentedText matchgroup=nomsuTextQuotes start=/\%(^\z(\(\s*\)\)[
 hi def link nomsuIndentedText String
 hi nomsuTextQuotes ctermfg=DarkMagenta
 
-syn region nomsuText matchgroup=nomsuTextQuotes start=/"\%($\)\@!/ end=/"/ contains=nomsuInterp,nomsuTextEscape
+syn region nomsuText matchgroup=nomsuTextQuotes start=/\%((\)\@<!"\|"\%($\)\@!/ end=/"\|$/ contains=nomsuInterp,nomsuTextEscape
 hi def link nomsuText String
 
 syn region nomsuIndentedBlock start=/\%(^\z(\s*\)[^\n]*\)\@<=:\s*$/ end=/\n\%(\z1\s\)\@!\%(\s*\.\.\)\?/
@@ -58,7 +59,7 @@ syn match nomsuVar /\$\%(\%([a-zA-Z0-9_-]\|[^\x00-\xff]\)\+\|(\@!\)/
 hi nomsuVar ctermfg=Cyan
 hi def link nomsuVar Identifier
 
-syn region nomsuActionVar matchgroup=nomsuVar start=/\$(/ end=/)/ contains=nomsuVarWord,nomsuVarWord,@nomsuAll
+syn region nomsuActionVar matchgroup=nomsuVar start=/\$(/ end=/)\|$/ contains=nomsuVarWord,nomsuVarOpWord,@nomsuAll
 
 syn match nomsuDollarSign /\$/ contained
 hi nomsuDollarSign ctermfg=Cyan
@@ -75,10 +76,10 @@ 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=Cyan
+hi nomsuVarWord ctermfg=LightCyan
 syn match nomsuVarOpWord ;[`~!@^&*_+=<>?'/-]\+\|\%(^\s*\)\@<!#; contained
 hi def link nomsuVarOpWord Function
-hi nomsuVarOpWord ctermfg=Cyan
+hi nomsuVarOpWord ctermfg=LightCyan
 
 syn match nomsuNumber /-\?\%(0x\x\+\|\d\+\%(\.\%(\d\+\)\?\)\?\|\.\d\+\)/
 hi def link nomsuNumber Number