diff --git a/bootstrap b/bootstrap
index fdad846..a8cd92a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -162,8 +162,7 @@ task_deploy_templates() {
 #         *************************************
 #
 # This file was generated by the bootstrap script and any changes will be
-# overwritten the next time the it is run. For local settings, use this
-# instead:
+# overwritten the next time it is run. For local settings, use this instead:
 #
 #   ~/.local/etc/git/config
 #
diff --git a/files/init.vim b/files/init.vim
index 4c25799..1237d1f 100644
--- a/files/init.vim
+++ b/files/init.vim
@@ -19,7 +19,7 @@ set   foldnestmax=10  " limit nested folds to 10 levels
 set   formatlistpat="^\s*\(\d\+[\]:.)}\t ]\|[-*]\|\[[ x]\]\|([ x])\)\s*"
 set   formatoptions-=t  " don't auto-wrap on 'textwidth'
 set   formatoptions+=c  " do auto-wrap comments on 'textwidth'
-set   formatoptions+=j  " remove comment leader when joining lings
+set   formatoptions+=j  " remove comment leader when joining lines
 set   formatoptions+=n  " recognize and indent lists automatically
 set   hidden            " hide abandoned buffers
 set   ignorecase        " ignore case when searching (see 'smartcase' below)