diff --git a/.gitignore b/.gitignore
index 0d20b64..9dbe9dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
 *.pyc
+/debian/files
+/debian/ibus-plover.debhelper.log
+/debian/ibus-plover.substvars
+debian/ibus-plover/*
diff --git a/Makefile b/Makefile
index 161aaec..e8475e5 100644
--- a/Makefile
+++ b/Makefile
@@ -3,16 +3,17 @@
 
 all:
 
-PREFIX ?= /usr
+PREFIX  ?= /usr
 DESTDIR ?=
 
 COMPONENT_DIR = $(DESTDIR)$(PREFIX)/share/ibus/component
-ENGINE_DIR = $(DESTDIR)$(PREFIX)/share/ibus-plover
+ENGINE_DIR    = $(DESTDIR)$(PREFIX)/share/ibus-plover
 
 install:
 	mkdir -p -m 755 $(ENGINE_DIR)
-	install -m755 -t $(ENGINE_DIR) ibus-engine-plover
-	install -m644 -t $(ENGINE_DIR) config.py engine.py ibus-plover.png main.py plover.xml
+	install  -m 755 -t $(ENGINE_DIR) ibus-engine-plover
+	install  -m 644 -t $(ENGINE_DIR) config.py engine.py ibus-plover.png main.py plover.xml
 	sed -i 's,/usr/share/ibus-plover/,$(PREFIX)/share/ibus-plover/,' $(ENGINE_DIR)/plover.xml
 	mkdir -p -m 755 $(COMPONENT_DIR)
-	ln -s $(shell python2 -c 'import os.path, sys; print os.path.relpath(*sys.argv[-2:])' $(ENGINE_DIR) $(COMPONENT_DIR))/plover.xml $(COMPONENT_DIR)/
+	ln -s $(shell python2 -c 'import os.path, sys; print os.path.relpath(*sys.argv[-2:])' $(ENGINE_DIR) $(COMPONENT_DIR))/plover.xml \
+	      $(COMPONENT_DIR)/
diff --git a/README.md b/README.md
index ac2278e..86b2bcf 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,19 @@
 IBus-Plover
 ===========
 
+This fork does not presently hold any advantages over Benoit Pierre's original work. I forked mainly so that I can create pull requests and experiment.
+
+The fnkeyqwertysteno keymap that I spoke of on Google Groups has been pulled out of my fork of this package, and is now in it's own package where it more properly belongs:
+
+ https://github.com/KarlHegbloom/xkb-noppoo-choc84-and-fnkeyqwertysteno
+ 
+ git clone https://github.com/KarlHegbloom/xkb-noppoo-choc84-and-fnkeyqwertysteno.git
+
+That keymap will allow the use of ibus-plover and plover standalone using the function and number key rows on the Noppoo Choc-84, (and, untested, they Keycool Hero 84), which have a unique layout that places the function keys and number keys in direct alignment, very suitable for use as the steno input keys.
+
+Author and Source
+=================
+
 - Author: Benoit Pierre (benoit.pierre@gmail.com)
 - Source: https://github.com/benoit-pierre/ibus-plover
 
@@ -33,6 +46,8 @@ Due to the way IBus works:
 - no state is saved when switching context (like applications): preedit text is lost
 - also no way (that I found) to be able to detect which application an input context is used for (to tailor some settings based on application)
 
+- For TeXmacs, use ibus-setup to disable "embed pre-edit text in application window".
+
 Debugging
 =========
 
diff --git a/debian/changelog b/debian/changelog
index 3b3f0a9..1aba55d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+ibus-plover (0.2.2-2-karlheg3) unstable; urgency=low
+
+  * Moved fnkeyqwertsteno to separate package.
+
+ -- Karl M. Hegbloom <karl.hegbloom@gmail.com>  Tue, 27 Oct 2015 21:47:17 -0600
+
+ibus-plover (0.2.2-2-karlheg2) unstable; urgency=low
+
+  * Merge Benoit Pierre's latest changes.
+  * Add fnkeyqwertysteno.xkb and fnkeyqwertysteno keymap and script to
+    launch http://qwertysteno.com after remapping the keyboard so that the
+    fnkey steno mapping works there. Use the ibus panel icon to switch the
+    mapping back after practice.
+
+ -- Karl M. Hegbloom <karl.hegbloom@gmail.com>  Sat, 17 Oct 2015 16:28:03 -0600
+
+ibus-plover (0.2.2-2-karlheg1) unstable; urgency=low
+
+  * Experiment with alternate keybindings for Noppoo Choc-84 / N-Key-USB.
+
+ -- Karl M. Hegbloom <karl.hegbloom@gmail.com>  Thu, 15 Oct 2015 14:34:56 -0600
+
 ibus-plover (0.2.2-2) trusty; urgency=medium
 
   * Lower IBus dependencies version
diff --git a/engine.py b/engine.py
index dcfa6f7..6e89ba9 100644
--- a/engine.py
+++ b/engine.py
@@ -26,10 +26,8 @@
 from plover.formatting import _Action, Formatter
 from plover.dictionary.loading_manager import manager as DictionaryManager
 import plover.config
-
 import logging
 
-
 PSEUDOKEY_TO_KEYCODE = {
     # Function bar.
     'esc': 1,
diff --git a/plover.xml b/plover.xml
index 3a86c77..fc46808 100644
--- a/plover.xml
+++ b/plover.xml
@@ -17,7 +17,7 @@
 	    <license>GPL</license>
 	    <author>Benoit Pierre &lt;benoit.pierre@gmail.com&gt;</author>
 	    <icon>/usr/share/ibus-plover/ibus-plover.png</icon>
-	    <layout>us</layout>
+            <layout>us</layout>
 	    <longname>Plover (English)</longname>
 	    <description>English input method for Plover, the Open Source Steno Program.</description>
 	    <rank>0</rank>