diff --git a/README.markdown b/README.markdown
index 6eefede..1731f85 100644
--- a/README.markdown
+++ b/README.markdown
@@ -6,7 +6,7 @@
 
 
 This plugin gives syntax highlighting to [todo.txt](http://todotxt.com/) files. It also defines a few
-mappings, to help with edition of these files:
+mappings, to help with editing these files:
 
 `<leader>-s` : Sort the file
 
@@ -28,5 +28,5 @@ mappings, to help with edition of these files:
 
 `<leader>-D` : Remove completed tasks
 
-If you want the help installed run ":helptags ~/.vim/doc" inside vim after having copied the files.
+If you want the help installed, run ":helptags ~/.vim/doc" inside vim after having copied the files.
 Then you will be able to get the commands help with: :h todo.txt
diff --git a/ftdetect/todo.vim b/ftdetect/todo.vim
index d16a6ee..774eb7c 100644
--- a/ftdetect/todo.vim
+++ b/ftdetect/todo.vim
@@ -1,8 +1,8 @@
 " File:        todo.txt.vim
 " Description: Todo.txt filetype detection
 " Author:      Leandro Freitas <freitass@gmail.com>
-" Licence:     Vim licence
-" Website:     http://github.com/freitass/todo.txt.vim
+" License:     Vim license
+" Website:     http://github.com/freitass/todo.txt-vim
 " Version:     0.1
 
 autocmd BufNewFile,BufRead [Tt]odo.txt set filetype=todo
diff --git a/ftplugin/todo.vim b/ftplugin/todo.vim
index a9b73a6..9127435 100644
--- a/ftplugin/todo.vim
+++ b/ftplugin/todo.vim
@@ -1,8 +1,8 @@
 " File:        todo.txt.vim
 " Description: Todo.txt filetype detection
 " Author:      Leandro Freitas <freitass@gmail.com>
-" Licence:     Vim licence
-" Website:     http://github.com/freitass/todo.txt.vim
+" License:     Vim license
+" Website:     http://github.com/freitass/todo.txt-vim
 " Version:     0.4
 
 " Save context {{{1
@@ -28,7 +28,7 @@ endfunction
 function! TodoTxtMarkAsDone()
     call s:TodoTxtRemovePriority()
     call TodoTxtPrependDate()
-    normal! Ix 
+    normal! Ix
 endfunction
 
 function! TodoTxtMarkAllAsDone()
diff --git a/syntax/todo.vim b/syntax/todo.vim
index 7395043..7b0e366 100644
--- a/syntax/todo.vim
+++ b/syntax/todo.vim
@@ -1,8 +1,8 @@
 " File:        todo.txt.vim
 " Description: Todo.txt syntax settings
 " Author:      Leandro Freitas <freitass@gmail.com>
-" Licence:     Vim licence
-" Website:     http://github.com/freitass/todo.txt.vim
+" License:     Vim license
+" Website:     http://github.com/freitass/todo.txt-vim
 " Version:     0.3
 
 if exists("b:current_syntax")