diff --git a/autoload/emmet.vim b/autoload/emmet.vim
index 1cc81b3..69852df 100644
--- a/autoload/emmet.vim
+++ b/autoload/emmet.vim
@@ -1,7 +1,7 @@
 "=============================================================================
 " emmet.vim
 " Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
-" Last Change: 22-Aug-2013.
+" Last Change: 25-Aug-2013.
 
 let s:save_cpo = &cpo
 set cpo&vim
@@ -442,7 +442,7 @@ function! emmet#expandAbbr(mode, abbr) range
   if a:mode == 2
     let leader = substitute(input('Tag: ', ''), '^\s*\(.*\)\s*$', '\1', 'g')
     if len(leader) == 0
-      return
+      return ''
     endif
     let mx = '|\(\%(html\|haml\|slim\|e\|c\|fc\|xsl\|t\|\/[^ ]\+\)\s*,\{0,1}\s*\)*$'
     if leader =~ mx
@@ -534,11 +534,11 @@ function! emmet#expandAbbr(mode, abbr) range
     endif
     normal! $
     call emmet#expandAbbr(0, "")
-    return
+    return ''
   else
     let line = getline('.')
     if col('.') < len(line)
-      let line = matchstr(line, '^\(.*\%'.col('.').'c.\)')
+      let line = matchstr(line, '^\(.*\%'.col('.').'c\)')
     endif
     if a:mode == 1
       let part = matchstr(line, '\([a-zA-Z0-9:_\-\@|]\+\)$')
@@ -618,11 +618,15 @@ function! emmet#expandAbbr(mode, abbr) range
       silent! foldopen
     endif
     silent! exe "normal! v7h\"_s"
+    if col('.') == col('$') - 1
+      call feedkeys('', 'n')
+    endif
     let &selection = oldselection
   endif
   if g:emmet_debug > 1
     call getchar()
   endif
+  return ''
 endfunction
 
 function! emmet#moveNextPrev(flag)
@@ -634,7 +638,8 @@ endfunction
 function! emmet#imageSize()
   let type = emmet#getFileType()
   let rtype = emmet#lang#exists(type) ? type : 'html'
-  return emmet#lang#{rtype}#imageSize()
+  call emmet#lang#{rtype}#imageSize()
+  return ''
 endfunction
 
 function! emmet#encodeImage()
@@ -646,7 +651,8 @@ endfunction
 function! emmet#toggleComment()
   let type = emmet#getFileType()
   let rtype = emmet#lang#exists(type) ? type : 'html'
-  return emmet#lang#{rtype}#toggleComment()
+  call emmet#lang#{rtype}#toggleComment()
+  return ''
 endfunction
 
 function! emmet#balanceTag(flag) range
@@ -671,7 +677,8 @@ endfunction
 function! emmet#removeTag()
   let type = emmet#getFileType()
   let rtype = emmet#lang#exists(type) ? type : 'html'
-  return emmet#lang#{rtype}#removeTag()
+  call emmet#lang#{rtype}#removeTag()
+  return ''
 endfunction
 
 function! emmet#anchorizeURL(flag)
@@ -680,7 +687,7 @@ function! emmet#anchorizeURL(flag)
   let url = matchstr(getline(pos1[0])[pos1[1]-1:], mx)
   let block = [pos1, [pos1[0], pos1[1] + len(url) - 1]]
   if !emmet#util#cursorInRegion(block)
-    return
+    return ''
   endif
 
   let mx = '.*<title[^>]*>\s*\zs\([^<]\+\)\ze\s*<\/title[^>]*>.*'
@@ -720,6 +727,7 @@ function! emmet#anchorizeURL(flag)
   let indent = substitute(getline('.'), '^\(\s*\).*', '\1', '')
   let expand = substitute(expand, "\n", "\n" . indent, 'g')
   call emmet#util#setContent(block, expand)
+  return ''
 endfunction
 
 function! emmet#codePretty() range
diff --git a/autoload/emmet/lang/css.vim b/autoload/emmet/lang/css.vim
index d4d6a3d..79db5b7 100644
--- a/autoload/emmet/lang/css.vim
+++ b/autoload/emmet/lang/css.vim
@@ -141,9 +141,9 @@ function! emmet#lang#css#toString(settings, current, type, inline, filters, item
   let current = a:current
   let value = current.value[1:-2]
   if emmet#useFilter(a:filters, 'fc')
-    let value = substitute(value, '\([^:]\+\):\([^;]*;\)', '\1: \2', 'g')
+    let value = substitute(value, '\([^:]\+\):\([^;]*\)', '\1: \2', 'g')
   else
-    let value = substitute(value, '\([^:]\+\):\([^;]*;\)', '\1:\2', 'g')
+    let value = substitute(value, '\([^:]\+\):\([^;]*\)', '\1:\2', 'g')
   endif
   if current.important
     let value = substitute(value, ';', ' !important;', '')
diff --git a/plugin/emmet.vim b/plugin/emmet.vim
index 0b4c803..f34f9ad 100644
--- a/plugin/emmet.vim
+++ b/plugin/emmet.vim
@@ -1,7 +1,7 @@
 "=============================================================================
 " File: emmet.vim
 " Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
-" Last Change: 22-Aug-2013.
+" Last Change: 25-Aug-2013.
 " Version: 0.82
 " WebPage: http://github.com/mattn/emmet-vim
 " Description: vim plugins for HTML and CSS hi-speed coding.
@@ -100,10 +100,10 @@ endif
 
 function! s:install_plugin(mode)
   for item in [
-  \ {'mode': 'i', 'var': 'user_emmet_expandabbr_key', 'key': ',', 'plug': 'EmmetExpandAbbr', 'func': '<c-g>u<esc>:call emmet#expandAbbr(0,"")<cr>a'},
+  \ {'mode': 'i', 'var': 'user_emmet_expandabbr_key', 'key': ',', 'plug': 'EmmetExpandAbbr', 'func': '<c-r>=emmet#expandAbbr(0,"")<cr><right>'},
   \ {'mode': 'n', 'var': 'user_emmet_expandabbr_key', 'key': ',', 'plug': 'EmmetExpandAbbr', 'func': ':call emmet#expandAbbr(3,"")<cr>'},
   \ {'mode': 'v', 'var': 'user_emmet_expandabbr_key', 'key': ',', 'plug': 'EmmetExpandAbbr', 'func': ':call emmet#expandAbbr(2,"")<cr>'},
-  \ {'mode': 'i', 'var': 'user_emmet_expandword_key', 'key': ';', 'plug': 'EmmetExpandWord', 'func': '<c-g>u<esc>:call emmet#expandAbbr(1,"")<cr>a'},
+  \ {'mode': 'i', 'var': 'user_emmet_expandword_key', 'key': ';', 'plug': 'EmmetExpandWord', 'func': '<c-r>=emmet#expandAbbr(1,"")<cr>'},
   \ {'mode': 'n', 'var': 'user_emmet_expandword_key', 'key': ';', 'plug': 'EmmetExpandWord', 'func': ':call emmet#expandAbbr(1,"")<cr>'},
   \ {'mode': 'i', 'var': 'user_emmet_balancetaginward_key', 'key': 'd', 'plug': 'EmmetBalanceTagInward', 'func': '<esc>:call emmet#balanceTag(1)<cr>'},
   \ {'mode': 'n', 'var': 'user_emmet_balancetaginward_key', 'key': 'd', 'plug': 'EmmetBalanceTagInward', 'func': ':call emmet#balanceTag(1)<cr>'},
@@ -115,17 +115,17 @@ function! s:install_plugin(mode)
   \ {'mode': 'n', 'var': 'user_emmet_next_key', 'key': 'n', 'plug': 'EmmetMoveNext', 'func': ':call emmet#moveNextPrev(0)<cr>'},
   \ {'mode': 'i', 'var': 'user_emmet_prev_key', 'key': 'N', 'plug': 'EmmetMovePrev', 'func': '<esc>:call emmet#moveNextPrev(1)<cr>'},
   \ {'mode': 'n', 'var': 'user_emmet_prev_key', 'key': 'N', 'plug': 'EmmetMovePrev', 'func': ':call emmet#moveNextPrev(1)<cr>'},
-  \ {'mode': 'i', 'var': 'user_emmet_imagesize_key', 'key': 'i', 'plug': 'EmmetImageSize', 'func': '<esc>:call emmet#imageSize()<cr>a'},
+  \ {'mode': 'i', 'var': 'user_emmet_imagesize_key', 'key': 'i', 'plug': 'EmmetImageSize', 'func': '<c-r>=emmet#imageSize()<cr>'},
   \ {'mode': 'n', 'var': 'user_emmet_imagesize_key', 'key': 'i', 'plug': 'EmmetImageSize', 'func': ':call emmet#imageSize()<cr>'},
-  \ {'mode': 'i', 'var': 'user_emmet_togglecomment_key', 'key': '/', 'plug': 'EmmetToggleComment', 'func': '<esc>:call emmet#toggleComment()<cr>a'},
+  \ {'mode': 'i', 'var': 'user_emmet_togglecomment_key', 'key': '/', 'plug': 'EmmetToggleComment', 'func': '<c-r>=emmet#toggleComment()<cr>'},
   \ {'mode': 'n', 'var': 'user_emmet_togglecomment_key', 'key': '/', 'plug': 'EmmetToggleComment', 'func': ':call emmet#toggleComment()<cr>'},
   \ {'mode': 'i', 'var': 'user_emmet_splitjointag_key', 'key': 'j', 'plug': 'EmmetSplitJoinTag', 'func': '<esc>:call emmet#splitJoinTag()<cr>'},
   \ {'mode': 'n', 'var': 'user_emmet_splitjointag_key', 'key': 'j', 'plug': 'EmmetSplitJoinTag', 'func': ':call emmet#splitJoinTag()<cr>'},
-  \ {'mode': 'i', 'var': 'user_emmet_removetag_key', 'key': 'k', 'plug': 'EmmetRemoveTag', 'func': '<esc>:call emmet#removeTag()<cr>a'},
+  \ {'mode': 'i', 'var': 'user_emmet_removetag_key', 'key': 'k', 'plug': 'EmmetRemoveTag', 'func': '<c-r>=emmet#removeTag()<cr>'},
   \ {'mode': 'n', 'var': 'user_emmet_removetag_key', 'key': 'k', 'plug': 'EmmetRemoveTag', 'func': ':call emmet#removeTag()<cr>'},
-  \ {'mode': 'i', 'var': 'user_emmet_anchorizeurl_key', 'key': 'a', 'plug': 'EmmetAnchorizeURL', 'func': '<esc>:call emmet#anchorizeURL(0)<cr>a'},
+  \ {'mode': 'i', 'var': 'user_emmet_anchorizeurl_key', 'key': 'a', 'plug': 'EmmetAnchorizeURL', 'func': '<c-r>=emmet#anchorizeURL(0)<cr>'},
   \ {'mode': 'n', 'var': 'user_emmet_anchorizeurl_key', 'key': 'a', 'plug': 'EmmetAnchorizeURL', 'func': ':call emmet#anchorizeURL(0)<cr>'},
-  \ {'mode': 'i', 'var': 'user_emmet_anchorizesummary_key', 'key': 'A', 'plug': 'EmmetAnchorizeSummary', 'func': '<esc>:call emmet#anchorizeURL(1)<cr>a'},
+  \ {'mode': 'i', 'var': 'user_emmet_anchorizesummary_key', 'key': 'A', 'plug': 'EmmetAnchorizeSummary', 'func': '<c-r>=emmet#anchorizeURL(1)<cr>'},
   \ {'mode': 'n', 'var': 'user_emmet_anchorizesummary_key', 'key': 'A', 'plug': 'EmmetAnchorizeSummary', 'func': ':call emmet#anchorizeURL(1)<cr>'},
   \ {'mode': 'v', 'var': 'user_emmet_mergelines_key', 'key': 'm', 'plug': 'EmmetMergeLines', 'func': ':call emmet#mergeLines()<cr>'},
   \ {'mode': 'v', 'var': 'user_emmet_codepretty_key', 'key': 'c', 'plug': 'EmmetCodePretty', 'func': ':call emmet#codePretty()<cr>'},