diff --git a/README.md b/README.md
index 662a2006..1cd79f4c 100644
--- a/README.md
+++ b/README.md
@@ -100,8 +100,6 @@ variables:
 ## Indentation Specific
 
 * `:h cino-:`
-* End-of-line continuations : `g:javascript_continuation` ( slightly complicated, look at the source code )
-* Start-of-line continuations : `g:javascript_opfirst` ( same as above )
 
 ## Contributing
 
diff --git a/indent/javascript.vim b/indent/javascript.vim
index 694403af..07800524 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -62,10 +62,10 @@ let s:line_term = '\s*\%(\%(\/\%(\%(\*.\{-}\*\/\)\|\%(\*\+\)\)\)\s*\)\=$'
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 if !exists('g:javascript_opfirst')
-  let g:javascript_opfirst = '\%([<>,:?^%|*&]\|\/[^/*]\|\([-.+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)'
+  let g:javascript_opfirst = '\%([<>,?^%|*&]\|\/[^/*]\|\([-.:+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)'
 endif
 if !exists('g:javascript_continuation')
-  let g:javascript_continuation = '\%([<=,.?/*:^%|&]\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)'
+  let g:javascript_continuation = '\%([<=,.?/*^%|&]\|:\@<!:\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)'
 endif
 
 let g:javascript_opfirst = s:line_pre . g:javascript_opfirst
@@ -112,6 +112,9 @@ function s:Balanced(lnum)
         let open_{idx} = open_{idx} + 1
       else
         let open_{idx - 1} = open_{idx - 1} - 1
+        if open_{idx - 1} < 0
+          return 0
+        end
       endif
     endif
     let pos = match(l:line, '[][(){}]', pos + 1)
@@ -122,7 +125,7 @@ endfunction
 
 function GetJavascriptIndent()
   if !exists('b:js_cache')
-    let b:js_cache = [0,0,0]
+    let b:js_cache = [0,0,0,0]
   endif
   " Get the current line.
   let l:line = getline(v:lnum)
@@ -150,11 +153,13 @@ function GetJavascriptIndent()
   endif
   "}}}
 
+  let known = 0
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
   call cursor(v:lnum,1)
   if b:js_cache[0] >= l:lnum  && b:js_cache[0] < v:lnum && b:js_cache[0] &&
         \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum) > 0)
+    let known = 1
     let num = b:js_cache[1]
   elseif syns != '' && l:line[0] =~ '\s'
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
@@ -163,28 +168,32 @@ function GetJavascriptIndent()
   else
     let num = s:GetPair('[({[]','[])}]','bW',2000)
   endif
-  let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
+
+  if known && b:js_cache[3]
+    let known = indent(b:js_cache[0]) - b:js_cache[3]
+  endif
+
+  let b:js_cache[:2] = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
   if l:line =~ s:line_pre . '[])}]'
     return indent(num)
   endif
 
-  call cursor(b:js_cache[1],b:js_cache[2])
 
-  let swcase = getline(l:lnum) =~# s:expr_case
-  let pline = swcase ? getline(l:lnum) : substitute(getline(l:lnum), '\%(:\@<!\/\/.*\)$', '','')
-  let inb = num == 0 || num < l:lnum && ((l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term) || s:IsBlock())
+  let pline = getline(l:lnum) =~# s:expr_case ? getline(l:lnum) : substitute(getline(l:lnum), '\%(:\@<!\/\/.*\)$', '','')
   let switch_offset = num == 0 || s:OneScope(num, strpart(getline(num),0,b:js_cache[2] - 1),1) !=# 'switch' ? 0 :
         \ &cino !~ ':' || !has('float') ?  s:sw() :
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
 
   " most significant, find the indent amount
-  if inb && !swcase && ((l:line =~# g:javascript_opfirst || pline =~# g:javascript_continuation) ||
-        \ num < l:lnum && s:OneScope(l:lnum,pline,0) =~# '\<\%(for\|each\|if\|let\|no\sb\|w\%(hile\|ith\)\)\>' &&
-        \ l:line !~ s:line_pre . '{')
-    return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
+  if ((l:line =~# g:javascript_opfirst || pline !~# s:expr_case . s:line_term && pline =~# g:javascript_continuation) ||
+        \ s:OneScope(l:lnum,pline,0) =~# '\<\%(for\|each\|if\|let\|no\sb\|w\%(hile\|ith\)\)\>' &&
+        \ l:line !~ s:line_pre . '{') && (num == 0 || cursor(b:js_cache[1],b:js_cache[2]) || s:IsBlock())
+    let b:js_cache[3] = (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
+    return b:js_cache[3] + known
   elseif num > 0
-    return indent(num) + s:sw() + switch_offset
+    let b:js_cache[3] = indent(num) + s:sw() + switch_offset
+    return b:js_cache[3] + known
   endif
 
 endfunction