diff --git a/runtime/ftplugin/css.vim b/runtime/ftplugin/css.vim
index 13a0f9f..d80582e 100644
--- a/runtime/ftplugin/css.vim
+++ b/runtime/ftplugin/css.vim
@@ -1,16 +1,17 @@
 " Vim filetype plugin file
 " Language:         CSS
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2006-04-19
+" Latest Revision:  2007-05-08
 
 if exists("b:did_ftplugin")
   finish
 endif
 let b:did_ftplugin = 1
 
-let b:undo_ftplugin = "setl com< cms< inc< fo<"
+let b:undo_ftplugin = "setl com< cms< inc< fo< ofu<"
 
 setlocal comments=s1:/*,mb:*,ex:*/ commentstring&
 setlocal formatoptions-=t formatoptions+=croql
+setlocal omnifunc=csscomplete#CompleteCSS
 
 let &l:include = '^\s*@import\s\+\%(url(\)\='
diff --git a/src/VisVim/Commands.cpp b/src/VisVim/Commands.cpp
index 254b7a9..95d7c0e 100644
--- a/src/VisVim/Commands.cpp
+++ b/src/VisVim/Commands.cpp
@@ -54,7 +54,7 @@
 void CCommands::SetApplicationObject (IApplication * pApplication)
 {
 	// This function assumes pApplication has already been AddRef'd
-	// for us, which CDSAddIn did in its QueryInterface call
+	// for us, which CDSAddIn did in it's QueryInterface call
 	// just before it called us.
 	m_pApplication = pApplication;
 	if (! m_pApplication)
@@ -494,8 +494,9 @@
 {
 
 	// OLE automation object for com. with Vim
-	// When the object goes out of scope, it's desctructor destroys the OLE connection;
-	// This is imortant to avoid blocking the object
+	// When the object goes out of scope, it's destructor destroys the OLE
+	// connection;
+	// This is important to avoid blocking the object
 	// (in this memory corruption would be likely when terminating Vim
 	// while still running DevStudio).
 	// So keep this object local!