diff --git a/VERSION b/VERSION
index 09fc3903..42c2d817 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1-Δ8
\ No newline at end of file
+1-Δ8ε1
\ No newline at end of file
diff --git a/manual.lyx b/manual.lyx
index 16fbf418..92d9c59f 100644
--- a/manual.lyx
+++ b/manual.lyx
@@ -1346,6 +1346,10 @@ Hold/unhold button <button> on controller <num> (1-8) for the next frame.
  See +controller for button names.
 \end_layout
 
+\begin_layout Standard
+Cauntion: Does not work properly if outside frame advance.
+\end_layout
+
 \begin_layout Subsubsection
 autofire (<pattern>|-)...
 \end_layout
@@ -1599,11 +1603,11 @@ Set where bsnes looks for firmware files.
 \end_layout
 
 \begin_layout Subsubsection
-targetfps
+target
 \end_layout
 
 \begin_layout Standard
-Set the target fps.
+Set the target .
  Numeric, range is 0.001 to 
 \begin_inset Quotes eld
 \end_inset
@@ -3653,29 +3657,29 @@ Return (also KPEnter): Execute command, ok modal dialog.
 \end_layout
 
 \begin_layout Itemize
-Pgup/Up (also KP8/9 if no num lock; command mode): Previous command in command
- history
+Pgup/Up (also KP8/9 if no num lock, CTRL+P; command mode): Previous command
+ in command history
 \end_layout
 
 \begin_layout Itemize
-Pgdn/Down(also KP2/3 if no num lock; command mode): Next command in command
- history
+Pgdn/Down(also KP2/3 if no num lock, CTRL+N; command mode): Next command
+ in command history
 \end_layout
 
 \begin_layout Itemize
-Home (also KP7 if no num lock; command mode): Beginning of command.
+Home (also KP7 if no num lock, CTRL+A; command mode): Beginning of command.
 \end_layout
 
 \begin_layout Itemize
-End (also KP1 if no num lock; command mode): End of command.
+End (also KP1 if no num lock, CTRL+E; command mode): End of command.
 \end_layout
 
 \begin_layout Itemize
-Left (also KP4 if no num lock; command mode): Move cursor left.
+Left (also KP4 if no num lock, CTRL+B; command mode): Move cursor left.
 \end_layout
 
 \begin_layout Itemize
-Right (also KP6 if no num lock; command mode): Move cursor right.
+Right (also KP6 if no num lock, CTRL+F; command mode): Move cursor right.
 \end_layout
 
 \begin_layout Itemize
@@ -3692,6 +3696,18 @@ Insert (also KP0 if no num lock; command mode): Toggle between insert /
 Backspace (command mode): Delete character to left of cursor.
 \end_layout
 
+\begin_layout Itemize
+CTRL+LEFT (also ALT+B; command mode): Previous word.
+\end_layout
+
+\begin_layout Itemize
+CTRL+RIGHT (also ALT+F; command mode): Next word.
+\end_layout
+
+\begin_layout Itemize
+ALT+D (also CTRL+W; command mode): Delete word.
+\end_layout
+
 \begin_layout Itemize
 LCTRL+LALT+ESCAPE: Ungraceful shutdown (leaves dump corrupted!).
 \end_layout
@@ -5937,5 +5953,33 @@ Delayed reset support
 Lua: memory.hash_region
 \end_layout
 
+\begin_layout Subsection
+rr1-delta8epsilon1
+\end_layout
+
+\begin_layout Itemize
+Rework the build system
+\end_layout
+
+\begin_layout Itemize
+Typing input support
+\end_layout
+
+\begin_layout Itemize
+Fix building with bsnes v086 and v087.
+\end_layout
+
+\begin_layout Itemize
+SDL: Save settings on exit
+\end_layout
+
+\begin_layout Itemize
+SDL: Command to enter command line mode with given command.
+\end_layout
+
+\begin_layout Itemize
+SDL: More advanced command editing.
+\end_layout
+
 \end_body
 \end_document
diff --git a/manual.txt b/manual.txt
index 37c69742..34de1642 100644
--- a/manual.txt
+++ b/manual.txt
@@ -653,6 +653,8 @@ Hold/unhold button <button> on controller <num> (1-8). See
 Hold/unhold button <button> on controller <num> (1-8) for the 
 next frame. See +controller for button names.
 
+Cauntion: Does not work properly if outside frame advance.
+
 6.7.28 autofire (<pattern>|-)...
 
 Set autofire pattern. Each parameter is comma-separated list of 
@@ -778,10 +780,10 @@ command.
 
 Set where bsnes looks for firmware files. Default is “.”.
 
-7.1.2 targetfps
+7.1.2 target
 
-Set the target fps. Numeric, range is 0.001 to “infinite”. 
-Default is native framerate.
+Set the target . Numeric, range is 0.001 to “infinite”. Default 
+is native framerate.
 
 7.1.3 savecompression
 
@@ -1895,21 +1897,23 @@ Following key names are known:
 
 • Return (also KPEnter): Execute command, ok modal dialog.
 
-• Pgup/Up (also KP8/9 if no num lock; command mode): Previous 
-  command in command history
+• Pgup/Up (also KP8/9 if no num lock, CTRL+P; command mode): 
+  Previous command in command history
 
-• Pgdn/Down(also KP2/3 if no num lock; command mode): Next 
-  command in command history
+• Pgdn/Down(also KP2/3 if no num lock, CTRL+N; command mode): 
+  Next command in command history
 
-• Home (also KP7 if no num lock; command mode): Beginning of 
+• Home (also KP7 if no num lock, CTRL+A; command mode): Beginning 
+  of command.
+
+• End (also KP1 if no num lock, CTRL+E; command mode): End of 
   command.
 
-• End (also KP1 if no num lock; command mode): End of command.
+• Left (also KP4 if no num lock, CTRL+B; command mode): Move 
+  cursor left.
 
-• Left (also KP4 if no num lock; command mode): Move cursor left.
-
-• Right (also KP6 if no num lock; command mode): Move cursor 
-  right.
+• Right (also KP6 if no num lock, CTRL+F; command mode): Move 
+  cursor right.
 
 • Delete (also KP. if no num lock; command mode): Delete 
   character to right of cursor.
@@ -1919,6 +1923,12 @@ Following key names are known:
 
 • Backspace (command mode): Delete character to left of cursor.
 
+• CTRL+LEFT (also ALT+B; command mode): Previous word.
+
+• CTRL+RIGHT (also ALT+F; command mode): Next word.
+
+• ALT+D (also CTRL+W; command mode): Delete word.
+
 • LCTRL+LALT+ESCAPE: Ungraceful shutdown (leaves dump 
   corrupted!).
 
@@ -2944,3 +2954,17 @@ set-axis joystick0axis19 disabled
 
 • Lua: memory.hash_region
 
+15.61 rr1-delta8epsilon1
+
+• Rework the build system
+
+• Typing input support
+
+• Fix building with bsnes v086 and v087.
+
+• SDL: Save settings on exit
+
+• SDL: Command to enter command line mode with given command.
+
+• SDL: More advanced command editing.
+
diff --git a/options.build b/options.build
index 005e8b94..e2bddcd2 100644
--- a/options.build
+++ b/options.build
@@ -7,29 +7,32 @@
 #
 
 
-# Prefix to apply to compiler commands for the target system.
+# Apply the following prefix for commands when building things that target the target system.
+# If not crosscompiling, leave blank.
 CROSS_PREFIX=
 
-# Postfix for object files
+# Postfix (without the leading dot) for object files.
+# Usually 'o'.
 OBJECT_SUFFIX=o
 
-# Postfix for archive files
+# Postfix (without the leading dot) for archive files.
+# Usually 'a'.
 ARCHIVE_SUFFIX=a
 
 # Postfix (including possible '.') for executable files.
-# Usually blank for any unix-type system, '.exe' for Windows.
+# Usually blank for unix-type systems (including Linux and Mac OS X), '.exe' for Windows.
 DOT_EXECUTABLE_SUFFIX=
 
-# C++ compiler (GCC 4.6)
-# CROSS_PREFIX is prepended to this.
+# C++ compiler (GCC 4.6) for the target system.
+# CROSS_PREFIX is prepended to this command.
 CC=g++-4.6
 
-# Linker for target system.
-# CROSS_PREFIX is prepended to this.
+# Linker for the target system.
+# CROSS_PREFIX is prepended to this command.
 LD=ld
 
 # Ranlib for target system.
-# CROSS_PREFIX is prepended to this.
+# CROSS_PREFIX is prepended to this command.
 RANLIB=ranlib
 
 # Host system C++ compiler.
@@ -91,26 +94,22 @@ SOUND=PORTAUDIO
 # - WXWIDGETS: wxWidgets (GRAPHICS=WXWIDGETS only)
 JOYSTICK=DUMMY
 
-# Enable use of Secret Rabbit Code (a.k.a. libsamperate).
-# Set to non-blank (e.g. 'yes') to enable.
+# Set to non-empty value (e.g. 'yes') to enable use of Secret Rabbit Code (a.k.a. libsamperate).
+# This is used for high-quality samplerate conversion for dumping.
 SECRET_RABBIT_CODE=
 
 # Bsnes version used.
 # 087 has different layout from the rest.
 BSNES_VERSION=085
 
-# Bsnes build uses compatiblity core, not accuracy core.
-# Set to non-empty value (e.g. 'yes') if so.
+# Set to non-empty value (e.g. 'yes') if bsnes build uses compatiblity core, not accuracy core.
 BSNES_IS_COMPAT=
 
-# Do boost libraries need the '-mt' prefix?
-# Set to non-empty value (e.g. 'yes') if so.
+# Set to non-empty value (e.g. 'yes') if boost libraries need the '-mt' prefix.
 BOOST_NEEDS_MT=
 
-# Does the linker not need -rdynamic to export the symbols?
-# Set to non-empty value (e.g. 'yes') if so.
+# Set to non-empty value (e.g. 'yes') if the linker exports symbols without -rdynamic.
 NO_RDYNAMIC=
 
-# Disable use of DLFCN.
-# Set to non-empty value (e.g. 'yes') if so.
+# Set to non-empty vlaue (e.g. 'yes') to disable use of DLFCN.
 NO_DLFCN=