diff --git a/vimperator/TODO b/vimperator/TODO
index 0965f954..f30bee47 100644
--- a/vimperator/TODO
+++ b/vimperator/TODO
@@ -25,6 +25,7 @@ BUGS:
- BookmarkAdd is fired once for each bookmark periodically i.e. not in response to adding a bookmark
FEATURES:
+9 finish :help TODOs
9 fix local options
9 adaptive timeout for auto-completions, :set completions can be updated more often than
:open foo
diff --git a/vimperator/locale/en-US/asciidoc.conf b/vimperator/locale/en-US/asciidoc.conf
index e46c276d..525cdc3f 100644
--- a/vimperator/locale/en-US/asciidoc.conf
+++ b/vimperator/locale/en-US/asciidoc.conf
@@ -22,7 +22,7 @@ email=stubenschrott@gmx.net
[replacements]
LOGO=
-HEADER=
+HEADER=
\[count\]=[count]
\[args\]=[args]
\[arg\]=[arg]
diff --git a/vimperator/locale/en-US/eval.txt b/vimperator/locale/en-US/eval.txt
index b7e51a8a..0904386d 100644
--- a/vimperator/locale/en-US/eval.txt
+++ b/vimperator/locale/en-US/eval.txt
@@ -26,8 +26,8 @@ ________________________________________________________________________________
|:echom| |:echomsg|
||:echom[sg] {expr}|| +
________________________________________________________________________________
-Echo the expression as an infomational message. Just like [c]:ec[ho][c], but
-also saves the message in the the message history.
+Echo the expression as an informational message. Just like [c]:ec[ho][c], but
+also saves the message in the message history.
________________________________________________________________________________
diff --git a/vimperator/locale/en-US/map.txt b/vimperator/locale/en-US/map.txt
index e3d35e20..97e4ea73 100644
--- a/vimperator/locale/en-US/map.txt
+++ b/vimperator/locale/en-US/map.txt
@@ -144,7 +144,7 @@ ________________________________________________________________________________
|:map-| +
________________________________________________________________________________
When the first argument to one of the mapping commands is , {rhs}
-is not echoed to the commandline, nor, for that matter, is anything else
+is not echoed to the command-line, nor, for that matter, is anything else
until the command has completed.
________________________________________________________________________________
@@ -324,7 +324,7 @@ Custom completion
Custom completion can be provided by specifying the "custom,{func}" argument to
-complete. The {func} is called with two arguments, a completion context, and
-an an object describing the command's arguments. It should set the context's
+an object describing the command's arguments. It should set the context's
\'completions' property, or return an object, with \'start' and \'items'
properties, describing the completions and where the replacement is to start.
diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt
index 22cdd8c7..31487e54 100644
--- a/vimperator/locale/en-US/options.txt
+++ b/vimperator/locale/en-US/options.txt
@@ -734,7 +734,7 @@ ____
|\'novb'| |\'novisualbell'| |\'vb'| |\'visualbell'|
||'visualbell' 'vb'|| boolean (default: off)
____
-Use visual bell instead of beeping on errors. The visualbell style is
+Use visual bell instead of beeping on errors. The visual bell style is
controlled by [c]:hi Bell[c]. If no bell is desired use [c]:set t_vb=[c] together with
this option.
____
diff --git a/vimperator/locale/en-US/tutorial.txt b/vimperator/locale/en-US/tutorial.txt
index 2a3db0ef..3ab9e5c9 100644
--- a/vimperator/locale/en-US/tutorial.txt
+++ b/vimperator/locale/en-US/tutorial.txt
@@ -62,8 +62,8 @@ and you can find out about the [m]gt[m] and [m]gT[m] mapping with
:help gt
:help gT
-Finally, in addition to the help system itself, [c]:exusage[c] and
-[c]:viusage[c] are useful quick-reference commands.
+Finally, in addition to the help system itself, [c]:exusage[c], [c]:viusage[c]
+and [c]:optionusage[c] are useful quick-reference commands.
section:Mouseless[living-mouseless]