diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3246781db..e82f9b5ed 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,11 +4,11 @@ Thank you in advance for being a part of this project and for helping to make Hy
 
 ## Beginners
 
-We have several beginner [issues](https://github.com/openfin/fin-hypergrid/issues) open for community involvement. Feel free to look all issues, especially those with the label "help wanted". Please ignore those with the label "on-hold" as the scope of these issues may change.
+We have several beginner [issues](https://github.com/fin-hypergrid/core/issues) open for community involvement. Feel free to look all issues, especially those with the label "help wanted". Please ignore those with the label "on-hold" as the scope of these issues may change.
 
 ## HyperGrid Core vs UserLand
 
-* Please see our [architectural overview](https://github.com/openfin/fin-hypergrid/blob/master/OVERVIEW.md)
+* Please see our [architectural overview](https://github.com/fin-hypergrid/core/blob/master/OVERVIEW.md)
 
 ## Getting Started
 
@@ -52,7 +52,7 @@ $ gulp
     problem by making the example concrete and imperative.
 ```
 
-* Make sure you have added the necessary [tests](https://github.com/openfin/fin-hypergrid/tree/master/test) for your changes.
+* Make sure you have added the necessary [tests](https://github.com/fin-hypergrid/core/tree/master/test) for your changes.
 * Run _all_ the tests to assure nothing else was accidentally broken.
 * Test your changes in all IE10+, Safari, Chrome, Chrome 40, Firefox
 * We are evaluating different testing strategies but for the moment, the major considerations are for
@@ -72,12 +72,12 @@ Code should be as self-explanatory as possible by using well-considered variable
 Use comments only to explain any remaining subtleties. 
 
 On the other hand, we do believe in good usage of jsdocs _especially_ if your updating a public api call.
-Here is an example of a [tutorial](http://openfin.github.io/fin-hypergrid/doc/tutorial-cell-editors.html)
+Here is an example of a [tutorial](http://fin-hypergrid.github.io/core/doc/tutorial-cell-editors.html)
 
 ## Submitting Changes
 
 * Push your changes to a topic branch in your fork of the repository.
-* Submit a pull request to the repository in the openfin organization.
+* Submit a pull request to the [`core` repository in the `fin-hypergrid` organization](https://github.com/fin-hypergrid/core/compare).
 * Do not submit until ready to publish — and then hold off a bit longer until you feel certain you are not submitting prematurely. If you find you absolutely must update a pull request, you must leave an explanatory comment. Updating will delay merging your PR if we have to review it again. Please try to avoid doing this (by not submitting too early; see above).
 * The core team looks at Pull Requests on a regular basis within a three-week sprint cycle.
 * If your PR is accepted, congratulations!! 
@@ -120,4 +120,4 @@ npm publish
 
 ## Additional Resources
 
-Feel free to open [issues](https://github.com/openfin/fin-hypergrid/issues) or email support@openfin.co
+Feel free to open [issues](https://github.com/fin-hypergrid/core/issues/new).
diff --git a/LICENSE b/LICENSE
index 52b754935..dba7cfea4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
-The OpenFin License
+MIT License
 
-Copyright (c) 2015 OpenFin Inc.
+Copyright (c) 2015-2018 Openfin and The Hypergrid Authors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -12,10 +12,6 @@ furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
-You may not redistribute the software or modifications as part of any
-application that can be described as a development toolkit, library or
-framework.
-
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
diff --git a/README.md b/README.md
index 3f5089a70..477e955c3 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,7 @@
-[![Build Status](https://travis-ci.org/openfin/fin-hypergrid.svg?branch=develop)](https://travis-ci.org/openfin/fin-hypergrid)
-
 **fin-hypergrid** is an ultra-fast HTML5 grid presentation layer, achieving its speed by rendering (in a canvas tag) only the currently visible portion of your (virtual) grid, thus avoiding the latency and life-cycle issues of building, walking, and maintaining a complex DOM structure. Please be sure to checkout our [design overview](OVERVIEW.md)
 
 Below is an example custom application built on top of the Hypergrid API tooling.
-It also highlights a DOM-based custom external editor triggered via hypergrid events as well as interaction with Hypergrid's column ordering API
+It also highlights a DOM-based custom external editor triggered via hypergrid events as well as interaction with Hypergrid’s column ordering API.
 
 <img src="images/README/gridshot04.gif">
 
@@ -17,9 +15,9 @@ It also highlights a DOM-based custom external editor triggered via hypergrid ev
 * [Roadmap](#roadmap)
 * [Contributing](#contributors)
 
-### Current Release (3.0.3 - 25 September 2018)
+### Current Release (3.1.0 - 29 September 2018)
 
-**Hypergrid 3.0 includes a revised data model with some breaking changes.**
+**Hypergrid 3.1 includes 3.0’s revised data model with some breaking changes.**
 
 _For a complete list of changes, see the [release notes](https://github.com/fin-hypergrid/core/releases)._
 
@@ -27,7 +25,7 @@ _For a complete list of changes, see the [release notes](https://github.com/fin-
 
 #### npm module _(recommended)_
 Published as a CommonJS module to npmjs.org.
-Specify a <a href="https://semver.org/">SEMVER</a> of `"fin-hypergrid": "3.0.3"` (or `"^3.0.3"`) in your package.json file,
+Specify a <a href="https://semver.org/">SEMVER</a> of `"fin-hypergrid": "3.1.0"` (or `"^3.1.0"`) in your package.json file,
 issue the `npm install` command, and let your bundler (<a target="webpack" href="https://webpack.js.org/">wepback</a>,
 <a target="browserify" href="http://browserify.org/">Browserify</a>) create a single file containing both Hypergrid and your application.
 
@@ -69,11 +67,11 @@ The [Perspective](https://github.com/jpmorganchase/perspective) open source proj
 
 ![](images/README/perspective.png)
 
-##### Hyperblotter
+##### AdaptableBlotter.JS
 
-[Openfin](http://openfin.co)'s Hyperblotter ([installer](https://dl.openfin.co/services/download?fileName=Hyperblotter&config=http://cdn.openfin.co/demos/hyperblotter/app.json)) is a demo app that shows the capabilities of both OpenFin and Hypergrid.
+[Openfin](http://openfin.co)’s AdaptableBlotter.JS ([installer](https://install.openfin.co/download/?fileName=adaptable_blotter_openfin&config=http://beta.adaptableblotter.com/app-beta.json)) is a demo app that shows the capabilities of both Openfin and Hypergrid.
 
-![](images/README/Hyperblotter%20Tabled%20Reduced%20Rows.png)
+![](images/README/partner-adaptableblotter_image-01@2x-667x375@2x.png)
 
 ### Features
 
@@ -81,7 +79,7 @@ The [Perspective](https://github.com/jpmorganchase/perspective) open source proj
 
 ### Testing
 
-Please use github [issues](https://github.com/fin-hypergrid/core/issues) to report problems
+Please use github [issues](https://github.com/fin-hypergrid/core/issues/new) to report problems
 
 We invite everyone to test the alpha branch for changes going into the next release
 
diff --git a/ROADMAP.md b/ROADMAP.md
index c55a1c5e7..8ac704621 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -2,19 +2,19 @@
 
 ### Queue
 
-You can find the current issues queue [here](https://github.com/openfin/fin-hypergrid/projects/5)
+You can find the current issues queue [here](https://github.com/fin-hypergrid/core/projects/5)
 
 ### JSDOC
 
-Continual Cleanup of API notes on [JSDOC](http://openfin.github.io/fin-hypergrid/doc/Hypergrid.html)
+Continual Cleanup of API notes on [JSDOC](http://fin-hypergrid.github.io/core/doc/Hypergrid.html)
 
 ## How YOU can help!
 
-- See our [projects backlog](https://github.com/openfin/fin-hypergrid/projects) <sup>[2](#myfootnote2)</sup>
+- See our [projects backlog](https://github.com/fin-hypergrid/core/projects) <sup>[2](#myfootnote2)</sup>
 
 <a name="myfootnote1">1</a>: 
-*Please note that we are dropping support for our treeview, aggregations, grouping, filtering, sorting and analytics services in general. Our reasoning is defined [here](https://github.com/openfin/fin-hypergrid/blob/master/OVERVIEW.md). These existing services are being exported out of Openfin's github domain, but they will still be available for private forking by those interested.*
+*Please note that we are dropping support for our treeview, aggregations, grouping, filtering, sorting and analytics services in general. Our reasoning is defined [here](https://github.com/fin-hypergrid/core/blob/master/OVERVIEW.md). These existing services are being exported out of Openfin's github domain, but they will still be available for private forking by those interested.*
 
 <a name="myfootnote2">2</a>:
-If you would like to work on on these ideas or suggest your own, feel free to browse through our [github issues](https://github.com/openfin/fin-hypergrid/issues)
+If you would like to work on on these ideas or suggest your own, feel free to browse through our [github issues](https://github.com/fin-hypergrid/core/issues)
 and read our [contributing guide](./CONTRIBUTING.md).
diff --git a/TESTING.md b/TESTING.md
index 1f3309a4c..11e8466ca 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -10,7 +10,7 @@ We've created an Alpha Branch for the Hypergrid OpenSource project.
 ### ALPHA 
 
 #### STEP 1 - GET IT AND INSTALL
-A) Download or Clone branch from https://github.com/openfin/fin-hypergrid/tree/alpha
+A) Download or Clone branch from https://github.com/fin-hypergrid/core/tree/alpha
          Note: Alpha builds are subject to incremental changes. We will announce when this happens.
 
      > npm install       
@@ -20,17 +20,17 @@ A) Download or Clone branch from https://github.com/openfin/fin-hypergrid/tree/a
 B) NPM
  Point your package.json to:
 
-     > "fin-hypergrid": "git@github.com:openfin/fin-hypergrid.git#alpha"
+     > "fin-hypergrid": "git@github.com/fin-hypergrid/core.git#alpha"
 
   OR
      
  Via npm install
    
-    > npm install git+https://github.com/openfin/fin-hypergrid.git#alpha
+    > npm install git+https://github.com/fin-hypergrid/core.git#alpha
 
 For more info see the [npm docs](https://docs.npmjs.com/files/package.json#git-urls-as-dependencies)
 
 #### STEP 2 - TEST IT
         Validate it works.
 
-Any questions, please contact us at support@openfin.co or open an [issue](https://github.com/openfin/fin-hypergrid/issues).
+Any questions, please open an [issue](https://github.com/fin-hypergrid/core/issues/new).
diff --git a/TRANSITION-NOTES.md b/TRANSITION-NOTES.md
index 532230dc4..f270b77da 100644
--- a/TRANSITION-NOTES.md
+++ b/TRANSITION-NOTES.md
@@ -10,9 +10,9 @@ Hypergrid developers: You must update your remotes with `git remote` to point to
 
 ### CDN
 
-For continuity with existing pages that make requests (via <script> tag) to Hypergrid's legacy "GitHub Pages" CDN (URLs beginning with https://openfin.github.io/fin-hypergrid), we have retained just the build files for v2.0.2 and v1.3.0 in that location. Note that this legacy hosting pertains only to the build files. 
+For continuity with existing pages that make requests (via <script> tag) to Hypergrid's legacy "GitHub Pages" CDN (URLs beginning with `https://fin-hypergrid.github.io/core`), we have retained just the build files for v2.0.2 and v1.3.0 in that location. Note that this legacy hosting pertains only to the build files. 
 
-The current v2.0.2 release can also be found on the new CDN; all new releases will be pushed to the new CDN _only._ See https://fin-hypergrid.github.io for index. **We recommend updating your apps to make requests against the new CDN.**
+The current release can also be found on the new CDN; all new releases will be pushed to the new CDN _only._ See https://fin-hypergrid.github.io for index. **We recommend updating your apps to make requests against the new CDN.**
 
 ### See also...
 
diff --git a/gh-pages.sh b/gh-pages.sh
deleted file mode 100755
index eb770c7b8..000000000
--- a/gh-pages.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-
-org="openfin"
-module="fin-hypergrid"
-
-# set variable repo to current directory name (without path)
-repo=${PWD##*/}
-
-# remove temp directory in case it already exists, remake it, switch to it
-rm -rf ../temp >/dev/null
-mkdir ../temp
-pushd ../temp >/dev/null
-
-# clone it so it will be a branch of the repo
-git clone -q --single-branch --recurse-submodules http://github.com/$org/$repo.git
-# git clone --single-branch --recurse-submodules http://github.com/$org/$repo.git --branch RC-1.0.5-beta-1
-cd $repo >/dev/null
-
-npm install >/dev/null
-
-# make sure the docs are built
-gulp build >/dev/null
-gulp doc >/dev/null
-
-# stash relevant folders
-mv demo doc ..
-
-# create and switch to a new gh-pages branch
-git checkout -q --orphan gh-pages
-
-# remove all content from this new branch
-git rm -rf -q .
-
-git clean -fd
-
-# copy the doc directory from the stash
-mv ../doc ../demo/* . >/dev/null
-
-# send it all up
-git add . >/dev/null
-git commit -q -m '(See gh-pages.sh on master branch.)'
-git push -ufq origin gh-pages
-
-# back to workspace
-popd >/dev/null
-
-# remove temp directory
-rm -rf ../temp >/dev/null
-
-echo 'Opening page at http://$org.github.io/$repo/ ...'
-open http://$org.github.io/$repo/
-echo 'Note that new github.io pages may not be immediately available.'
-echo 'You may need to wait a few minutes and refresh.'
diff --git a/images/README/partner-adaptableblotter_image-01@2x-667x375@2x.png b/images/README/partner-adaptableblotter_image-01@2x-667x375@2x.png
new file mode 100644
index 000000000..a102500fe
Binary files /dev/null and b/images/README/partner-adaptableblotter_image-01@2x-667x375@2x.png differ
diff --git a/images/index.js b/images/index.js
index 99db78243..fc0b692d5 100644
--- a/images/index.js
+++ b/images/index.js
@@ -16,37 +16,37 @@ var _ = require('object-iterators');
 var images = require('./images'); // this is the file generated by gulpfile.js (and ignored by git)
 
 /**
- * <img src="https://raw.githubusercontent.com/openfin/fin-hypergrid/master/images/calendar.png">
+ * <img src="https://raw.githubusercontent.com/fin-hypergrid/core/master/images/calendar.png">
  * @name calendar
  * @memberOf module:images
  */
 
 /**
- * <img src="https://raw.githubusercontent.com/openfin/fin-hypergrid/master/images/checked.png">
+ * <img src="https://raw.githubusercontent.com/fin-hypergrid/core/master/images/checked.png">
  * @name checked
  * @memberOf module:images
  */
 
 /**
- * <img src="https://raw.githubusercontent.com/openfin/fin-hypergrid/master/images/unchecked.png">
+ * <img src="https://raw.githubusercontent.com/fin-hypergrid/core/master/images/unchecked.png">
  * @name unchecked
  * @memberOf module:images
  */
 
 /**
- * <img src="https://raw.githubusercontent.com/openfin/fin-hypergrid/master/images/filter-off.png">
+ * <img src="https://raw.githubusercontent.com/fin-hypergrid/core/master/images/filter-off.png">
  * @name filter-off
  * @memberOf module:images
  */
 
 /**
- * <img src="https://raw.githubusercontent.com/openfin/fin-hypergrid/master/images/filter-on.png">
+ * <img src="https://raw.githubusercontent.com/fin-hypergrid/core/master/images/filter-on.png">
  * @name filter-on
  * @memberOf module:images
  */
 
 /**
- * <img src="https://raw.githubusercontent.com/openfin/fin-hypergrid/master/images/up-down.png">
+ * <img src="https://raw.githubusercontent.com/fin-hypergrid/core/master/images/up-down.png">
  * @name up-down
  * @memberOf module:images
  */
diff --git a/jsdoc-template-hypergrid b/jsdoc-template-hypergrid
index be594c9b5..a98e7261b 160000
--- a/jsdoc-template-hypergrid
+++ b/jsdoc-template-hypergrid
@@ -1 +1 @@
-Subproject commit be594c9b530a397efb9573b0d0cc75199c383cb5
+Subproject commit a98e7261b8eee1b2b0fd1e80eaa0e359a2f22761
diff --git a/package.json b/package.json
index 715cc3e4b..0d8f059cf 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,19 @@
 {
   "name": "fin-hypergrid",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "description": "Canvas-based high-performance grid",
   "main": "src/Hypergrid",
   "repository": {
     "type": "git",
     "url": "git://github.com/fin-hypergrid/core.git"
   },
-  "author": "SWirts, JEiten, DJones, NMichaud",
+  "author": "Steve Wirts (https://github.com/stevewirts)",
+  "contributors": [
+    "Jonathan Eiten (https://github.com/joneit)",
+    "Dwayne Jones (https://github.com/dwaynekj)",
+    "Naveen Michaud-Agrawal (https://github.com/nmichaud)",
+    "Hugo Nogueira (https://github.com/hugoeanogueira)"
+  ],
   "license": "MIT",
   "readmeFilename": "README.md",
   "gitHead": "",
@@ -19,7 +25,7 @@
     "datasaur-base": "^3.0.0",
     "datasaur-local": "^3.0.0",
     "extend-me": "^2.7.0",
-    "finbars": "^1.6.0",
+    "finbars": "^2.0.0",
     "inject-stylesheet-template": "^1.0.1",
     "mustache": "^2.3.0",
     "object-iterators": "1.3.0",
diff --git a/src/Hypergrid/index.js b/src/Hypergrid/index.js
index 5e19c3869..9b126b54e 100644
--- a/src/Hypergrid/index.js
+++ b/src/Hypergrid/index.js
@@ -34,31 +34,6 @@ var EDGE_STYLES = ['top', 'bottom', 'left', 'right'],
  * @constructor
  * @classdesc An object representing a Hypergrid.
  * @desc The first parameter, `container`, is optional. If omitted, the `options` parameter is promoted to first position. (Note that the container can also be given in `options.container.`)
- * #### `options.canvasContextAttributes` object (see below)
- * The only currently meaningful property of this object is `alpha`:
- *
- * ```js
- * var gridOptions = {
- *     canvasContextAttributes: { alpha: false }
- * };
- * var myGrid = new Hypergrid(gridOptions);
- * ```
- *
- * `alpha` is a boolean that indicates if the canvas contains an alpha channel. If set to `false`, the browser now knows that the backdrop is always opaque, which can speed up drawing of transparent content and images.
- *
- * This option was added by request although testing failed to show any measurable performance benefit.
- *
- * Use with caution. In particular, if the canvas is set to "opaque" (`{alpha: false}`), do _not_ also specify a transparent or translucent color for `grid.properties.backGround` because content may then be drawn with corrupt anti-aliasing (at lest in Chrome v67).
- *
- * Note that such an "opaque" canvas can still be made to appear translucent using the CSS `opacity` property — a different effect entirely.
- *
- * Although this option has no apparent performance gains (in Chrome v63), it does permit the graphics context to use [sub-pixel rendering](https://en.wikipedia.org/wiki/Subpixel_rendering) for sharper text as viewed on LCD or LED screens, especially black text on white backgrounds, and especially when viewed on a high-pixel-density display such as an [Apple retina display](https://en.wikipedia.org/wiki/Retina_Display).
- *
- * value | Canvas | Text | Sample
- * ----- | :----: | :--: | ------
- * `{ alpha: true } ` | transparent | regular<br>anti-aliasing | ![regular.png](https://cdn-pro.dprcdn.net/files/acc_645730/ZqurK3)
- * `{ alpha: false }` | opaque | sub-pixel<br>rendering | ![sub-pixel.png](https://cdn-std.dprcdn.net/files/acc_645730/bf3VXh)
- *
  * @param {string|Element} [container] - CSS selector or Element. If omitted (and `options.container` also omitted), Hypergrid first looks for an _empty_ element with an ID of `hypergrid`. If not found, it will create a new element. In either case, the container element has the class name `hypergrid-container` added to its class name list. Finally, if the there is more than one such element with that class name, the element's ID attribute is set to `hypergrid` + _n_ where n is an ordinal one less than the number of such elements.
  * @param {object} [options] - If `options.data` provided, passed to {@link Hypergrid#setData setData}; else if `options.Behavior` provided, passed to {@link Hypergrid#setBehavior setBehavior}.
  * @param {function} [options.Behavior=Local] - _Per {@link Behavior#setData}._
@@ -73,8 +48,22 @@ var EDGE_STYLES = ['top', 'bottom', 'left', 'right'],
  *
  * @param {string|Element} [options.container] - Alternative to providing `container` (first) parameter above.
  *
- * @param {object} [options.canvasContextAttributes] - Passed to [`HTMLCanvasElement.getContext`](https://developer.mozilla.org/docs/Web/API/HTMLCanvasElement/getContext). _Please see discussion above._
+ * @param {object} [options.contextAttributes={ alpha: true }] - Passed to [`HTMLCanvasElement.getContext`](https://developer.mozilla.org/docs/Web/API/HTMLCanvasElement/getContext). Although the MDN docs say setting this to `{alpha: false}` (opaque canvas) can "can speed up drawing of transparent content and images," our testing (with Chrome v63) failed to show any measurable performance gain.
+ *
+ * _An opaque canvas does have an important advantage, however!_ It permits the graphics context to use [sub-pixel rendering](https://en.wikipedia.org/wiki/Subpixel_rendering) for sharper text as viewed on LCD or LED screens, especially black text on white backgrounds, and especially when viewed on a high-pixel-density display such as an [Apple retina display](https://en.wikipedia.org/wiki/Retina_Display).
+ *
+ * Zoom in on the following samples images to see the difference in rendering.
+ *
+ * Value | Sample
+ * :---: | :----:
+ * `{ alpha: true }`<br>Transparent canvas,<br>renders text using<br>_regular anti-aliasing_ | ![regular.png](https://cdn-pro.dprcdn.net/files/acc_645730/ZqurK3)
+ * `{ alpha: false }`<br>Opaque canvas,<br>renders text using<br>_sub-pixel rendering_ | ![sub-pixel.png](https://cdn-std.dprcdn.net/files/acc_645730/bf3VXh).
+ *
+ * Use with caution, however. In particular, if the canvas is set to "opaque" (`{alpha: false}`), do _not_ also specify a transparent or translucent color for `grid.properties.backGround` because content may then be drawn with corrupt anti-aliasing (at lest as of Chrome v67).
+ *
+ * To clarify, the default setting (`{ alpha: true }`) is a transparent canvas, meaning that elements rendered underneath the `<canvas>` element can be seen through any non-opaque pixels (pixels with alpha channel < 1.0). Hypergrids that set their background color to non-opaque can see this effect.
  *
+ * Note: An opaque canvas can still be made _to appear_ translucent using the CSS `opacity` property. But that is a different effect entirely, setting the entire rendered canvas to translucent, not just so all pixels become translucent.
  * @param {string} [options.localization=Hypergrid.localization]
  * @param {string|string[]} [options.localization.locale=Hypergrid.localization.locale] - The default locale to use when an explicit `locale` is omitted from localizer constructor calls. Passed to `Intl.NumberFomrat` and `Intl.DateFomrat`. See {@link https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Intl#Locale_identification_and_negotiation|Locale identification and negotiation} for more information.
  * @param {string} [options.localization.numberOptions=Hypergrid.localization.numberOptions] - Options passed to [`Intl.NumberFormat`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/NumberFormat) for creating the basic "number" localizer.
@@ -1048,7 +1037,11 @@ var Hypergrid = Base.extend('Hypergrid', {
 
             this.div.appendChild(divCanvas);
 
-            var canvas = new Canvas(divCanvas, this.renderer, options && options.contextAttributes);
+            var contextAttributes = options && (
+                options.contextAttributes ||
+                options.canvasContextAttributes
+            );
+            var canvas = new Canvas(divCanvas, this.renderer, contextAttributes);
             canvas.canvas.classList.add('hypergrid');
 
             this.divCanvas = divCanvas;
diff --git a/src/Hypergrid/modules.js b/src/Hypergrid/modules.js
index a9ca1a35d..348afa40e 100644
--- a/src/Hypergrid/modules.js
+++ b/src/Hypergrid/modules.js
@@ -26,6 +26,7 @@ Object.defineProperties(module.exports, {
     'datasaur-base': { value: require('datasaur-base') }, // may be removed in a future release
     'datasaur-local': { value: require('datasaur-local') }, // may be removed in a future release
     'extend-me': {value: require('extend-me') },
+    finbars: { value: require('finbars') },
     'object-iterators': { value: require('object-iterators') },
     overrider: { value: require('overrider') },
     rectangular: { value: require('rectangular') },
diff --git a/src/Hypergrid/themes.js b/src/Hypergrid/themes.js
index 591b326ae..d66a9617c 100644
--- a/src/Hypergrid/themes.js
+++ b/src/Hypergrid/themes.js
@@ -261,7 +261,7 @@ var sharedMixin = {
     },
 
     /**
-     * App developers are free to add in additional themes, such as those in {@link https://openfin.github.com/fin-hypergrid-themes/themes}:
+     * App developers are free to add in additional themes, such as those in {@link https://github.com/fin-hypergrid/themes/tree/master/js}:
      * ```javascript
      * Hypergrind.registerThemes(require('fin-hypergrid-themes'));
      * ```
diff --git a/src/behaviors/Column.js b/src/behaviors/Column.js
index 039ea4d97..76fbe3267 100644
--- a/src/behaviors/Column.js
+++ b/src/behaviors/Column.js
@@ -188,7 +188,7 @@ Column.prototype = {
     },
 
     setWidth: function(width) {
-        width = Math.max(this.properties.minimumColumnWidth, width);
+        width = Math.min(Math.max(this.properties.minimumColumnWidth, width), this.properties.maximumColumnWidth || Infinity);
         if (width !== this.properties.width) {
             this.properties.width = width;
             this.properties.columnAutosizing = false;
diff --git a/src/defaults.js b/src/defaults.js
index 647a68eb4..d8da405fa 100644
--- a/src/defaults.js
+++ b/src/defaults.js
@@ -748,6 +748,8 @@ var defaults = {
     defaultRowHeight: version > 2 ? 14 : 15,
 
     /**
+     * This default column width is used when `width` property is undefined.
+     * (`width` is defined on column creation unless {@link module:defaults.columnAutosizing columnAutosizing} has been set to `false`.)
      * @default
      * @type {number}
      * @memberOf module:defaults
@@ -755,12 +757,28 @@ var defaults = {
     defaultColumnWidth: 100,
 
     /**
+     * Minimum column width.
+     * Adjust this value for different fonts/sizes or exotic cell renderers.
+     * _Must be defined._
+     * The default (`5`) is enough room for an ellipsis with default font size.
      * @default
      * @type {number}
      * @memberOf module:defaults
      */
     minimumColumnWidth: 5,
 
+    /**
+     * Maximum column width.
+     * _When defined,_ column width is clamped to this value by {@link Column#setWidth setWidth}).
+     * Ignored when falsy.
+     * Respects {@link module:defaults.resizeColumnInPlace resizeColumnInPlace} but may cause user confusion when
+     * user can't make column narrower due to next column having reached its maximum.
+     * @default
+     * @type {number}
+     * @memberOf module:defaults
+     */
+    maximumColumnWidth: undefined,
+
     /**
      * Resizing a column through the UI (by clicking and dragging on the column's
      * right border in the column header row) normally affects the width of the whole grid.
@@ -769,12 +787,12 @@ var defaults = {
      * In other words, if user expands (say) the third column, then the fourth column will contract —
      * and _vice versa_ — without therefore affecting the width of the grid.
      *
-     * This is a _column propert_ and may be set for selected columns (`myColumn.properties.resizeColumnInPlace`)
-     * or for all columns by setting it at the grid level. (`myGrid.properties.resizeColumnInPlace`).
+     * This is a _column property_ and may be set for selected columns (`myColumn.properties.resizeColumnInPlace`)
+     * or for all columns by setting it at the grid level (`myGrid.properties.resizeColumnInPlace`).
      *
      * Note that the implementation of this property does not allow expanding a
      * column beyond the width it can borrow from the next column.
-     * The last column, however, is unconstrained and resizing it will affect the total grid width.
+     * The last column, however, is unconstrained, and resizing of course affects the total grid width.
      * @default
      * @type {boolean}
      * @memberOf module:defaults
diff --git a/src/features/ColumnResizing.js b/src/features/ColumnResizing.js
index 74a8e96c7..e336407cb 100644
--- a/src/features/ColumnResizing.js
+++ b/src/features/ColumnResizing.js
@@ -63,17 +63,23 @@ var ColumnResizing = Feature.extend('ColumnResizing', {
      */
     handleMouseDrag: function(grid, event) {
         if (this.dragColumn) {
-            var delta = this.getMouseValue(event) - this.dragStart;
-            var dragWidth = this.dragStartWidth + delta;
-            if (!this.nextColumn) {
+            var delta = this.getMouseValue(event) - this.dragStart,
+                dragWidth = this.dragStartWidth + delta,
+                nextWidth = this.nextStartWidth - delta;
+            if (!this.nextColumn) { // nextColumn et al instance vars defined when resizeColumnInPlace (by handleMouseDown)
                 grid.behavior.setColumnWidth(this.dragColumn, dragWidth);
-            } else if (
-                0 < delta && delta <= (this.nextStartWidth - this.nextColumn.properties.minimumColumnWidth) ||
-                0 > delta && delta >= -(this.dragStartWidth - this.dragColumn.properties.minimumColumnWidth)
-            ) {
-                var nextWidth = this.nextStartWidth - delta;
-                grid.behavior.setColumnWidth(this.dragColumn, dragWidth);
-                grid.behavior.setColumnWidth(this.nextColumn, nextWidth);
+            } else {
+                var np = this.nextColumn.properties, dp = this.dragColumn.properties;
+                if (
+                    0 < delta && delta <= (this.nextStartWidth - np.minimumColumnWidth) &&
+                    (!dp.maximumColumnWidth || dragWidth <= dp.maximumColumnWidth)
+                    ||
+                    0 > delta && delta >= -(this.dragStartWidth - dp.minimumColumnWidth) &&
+                    (!np.maximumColumnWidth || nextWidth < np.maximumColumnWidth)
+                ) {
+                    grid.behavior.setColumnWidth(this.dragColumn, dragWidth);
+                    grid.behavior.setColumnWidth(this.nextColumn, nextWidth);
+                }
             }
         } else if (this.next) {
             this.next.handleMouseDrag(grid, event);
diff --git a/src/jsdoc/tutorials/cell-editors.md b/src/jsdoc/tutorials/cell-editors.md
index d95fde09e..2667e9e0a 100644
--- a/src/jsdoc/tutorials/cell-editors.md
+++ b/src/jsdoc/tutorials/cell-editors.md
@@ -159,13 +159,13 @@ See the full {@link DataModel#getCellEditorAt|getCellEditorAt} API.
 
 The following cell editors are preregistered in `grid.cellEditors`. See each for its template and notes on browser limitations.
 
-* {@link http://openfin.github.io/fin-hypergrid/doc/Color.html|Color}
-* {@link http://openfin.github.io/fin-hypergrid/doc/ComboBox.html|ComboBox}
-* {@link http://openfin.github.io/fin-hypergrid/doc/Date.html|Date}
-* {@link http://openfin.github.io/fin-hypergrid/doc/Number.html|Number}
-* {@link http://openfin.github.io/fin-hypergrid/doc/Slider.html|Slider}
-* {@link http://openfin.github.io/fin-hypergrid/doc/Spinner.html|Spinner}
-* {@link http://openfin.github.io/fin-hypergrid/doc/Textfield.html|Textfield}
+* {@link http://fin-hypergrid.github.io/core/doc/Color.html|Color}
+* {@link http://fin-hypergrid.github.io/core/doc/ComboBox.html|ComboBox}
+* {@link http://fin-hypergrid.github.io/core/doc/Date.html|Date}
+* {@link http://fin-hypergrid.github.io/core/doc/Number.html|Number}
+* {@link http://fin-hypergrid.github.io/core/doc/Slider.html|Slider}
+* {@link http://fin-hypergrid.github.io/core/doc/Spinner.html|Spinner}
+* {@link http://fin-hypergrid.github.io/core/doc/Textfield.html|Textfield}
 
 ### Development
 
diff --git a/src/jsdoc/tutorials/cell-renderer.md b/src/jsdoc/tutorials/cell-renderer.md
index b328dc133..5cf1d7982 100644
--- a/src/jsdoc/tutorials/cell-renderer.md
+++ b/src/jsdoc/tutorials/cell-renderer.md
@@ -49,7 +49,7 @@ While the default cell renderer renders data as text, cell renderers are not con
 
 ### Default Renderers Available
 
-The {@link http://openfin.github.io/fin-hypergrid/doc/CellRenderer.html|CellRenderer Base Class} is the object that provides a empty cell.
+The {@link http://fin-hypergrid.github.io/core/doc/CellRenderer.html|CellRenderer Base Class} is the object that provides a empty cell.
 
 The following cell renderers are available for you to use declaratively. They have been extended from the CellRenderer base.
  
@@ -137,7 +137,7 @@ Parameter                       | Description
 
 ### Creating your own renderer
 
-You can create your own renderer by extending from the [CellRenderer](http://openfin.github.io/fin-hypergrid/doc/CellRenderer.html) base class and overriding the `paint` method that expects `gc` (2D graphics context) object and a `config` object (described above).
+You can create your own renderer by extending from the [CellRenderer](http://fin-hypergrid.github.io/core/doc/CellRenderer.html) base class and overriding the `paint` method that expects `gc` (2D graphics context) object and a `config` object (described above).
 
 Register your new cell renderer on the grid with `grid.cellRenderers.add`. This allows it to be referenced by name (in the cell's `renderer` render property).
 
diff --git a/src/lib/Canvas.js b/src/lib/Canvas.js
index ac42752ea..830172307 100644
--- a/src/lib/Canvas.js
+++ b/src/lib/Canvas.js
@@ -335,7 +335,7 @@ Canvas.prototype = {
     dispatchNewMouseKeysEvent: function(event, name, detail) {
         detail = detail || {};
         detail.mouse = this.mouseLocation;
-        detail.keys = this.currentKeys;
+        defKeysProp.call(this, event, 'keys', detail);
         return this.dispatchNewEvent(event, name, detail);
     },
 
@@ -452,12 +452,8 @@ Canvas.prototype = {
             return;
         }
 
-        // prevent TAB from moving focus off the canvas element
-        if (e.keyCode === 9) {
-            e.preventDefault();
-        }
+        var keyChar = updateCurrentKeys.call(this, e, true);
 
-        var keyChar = this.getKeyChar(e);
         if (e.repeat) {
             if (this.repeatKey === keyChar) {
                 this.repeatKeyCount++;
@@ -470,11 +466,8 @@ Canvas.prototype = {
             this.repeatKeyCount = 0;
             this.repeatKeyStartTime = 0;
         }
-        if (this.currentKeys.indexOf(keyChar) === -1) {
-            this.currentKeys.push(keyChar);
-        }
 
-        this.dispatchNewEvent(e, 'fin-canvas-keydown', {
+        this.dispatchNewEvent(e, 'fin-canvas-keydown', defKeysProp.call(this, e, 'currentKeys', {
             alt: e.altKey,
             ctrl: e.ctrlKey,
             char: keyChar,
@@ -485,9 +478,8 @@ Canvas.prototype = {
             repeatCount: this.repeatKeyCount,
             repeatStartTime: this.repeatKeyStartTime,
             shift: e.shiftKey,
-            identifier: e.key,
-            currentKeys: this.currentKeys.slice(0)
-        });
+            identifier: e.key
+        }));
     },
 
     finkeyup: function(e) {
@@ -495,17 +487,12 @@ Canvas.prototype = {
             return;
         }
 
-        // prevent TAB from moving focus off the canvas element
-        if (e.keyCode === 9) {
-            e.preventDefault();
-        }
+        var keyChar = updateCurrentKeys.call(this, e, false);
 
-        var keyChar = this.getKeyChar(e);
-        this.currentKeys.splice(this.currentKeys.indexOf(keyChar), 1);
         this.repeatKeyCount = 0;
         this.repeatKey = null;
         this.repeatKeyStartTime = 0;
-        this.dispatchNewEvent(e, 'fin-canvas-keyup', {
+        this.dispatchNewEvent(e, 'fin-canvas-keyup', defKeysProp.call(this, e, 'currentKeys', {
             alt: e.altKey,
             ctrl: e.ctrlKey,
             char: keyChar,
@@ -517,7 +504,7 @@ Canvas.prototype = {
             shift: e.shiftKey,
             identifier: e.key,
             currentKeys: this.currentKeys.slice(0)
-        });
+        }));
     },
 
     finfocusgained: function(e) {
@@ -791,6 +778,72 @@ function makeCharMap() {
     return map;
 }
 
+function updateCurrentKeys(e, keydown) {
+    var keyChar = this.getKeyChar(e);
+
+    // prevent TAB from moving focus off the canvas element
+    switch (keyChar) {
+        case 'TAB':
+        case 'TABSHIFT':
+        case 'Tab':
+            e.preventDefault();
+    }
+
+    fixCurrentKeys.call(this, keyChar, keydown);
+
+    return keyChar;
+}
+
+function fixCurrentKeys(keyChar, keydown) {
+    var index = this.currentKeys.indexOf(keyChar);
+
+    if (!keydown && index >= 0) {
+        this.currentKeys.splice(index, 1);
+    }
+
+    if (keyChar === 'SHIFT') {
+        // on keydown, replace unshifted keys with shifted keys
+        // on keyup, vice-versa
+        this.currentKeys.forEach(function(key, index, currentKeys) {
+            var pair = charMap.find(function(pair) {
+                return pair[keydown ? 0 : 1] === key;
+            });
+            if (pair) {
+                currentKeys[index] = pair[keydown ? 1 : 0];
+            }
+        });
+    }
+
+    if (keydown && index < 0) {
+        this.currentKeys.push(keyChar);
+    }
+}
+
+function defKeysProp(event, propName, object) {
+    var canvas = this;
+    Object.defineProperty(object, propName, {
+        configurable: true,
+        ennumerable: true,
+        get: function() {
+            var shiftKey;
+            if ('shiftKey' in event) {
+                fixCurrentKeys.call(canvas, 'SHIFT', shiftKey = event.shiftKey);
+            } else {
+                shiftKey = canvas.currentKeys.indexOf('SHIFT') >= 0;
+            }
+            var SHIFT = shiftKey ? 'SHIFT' : '';
+            if ('ctrlKey' in event) {
+                fixCurrentKeys.call(canvas, 'CTRL' + SHIFT, event.ctrlKey);
+            }
+            if ('altKey' in event) {
+                fixCurrentKeys.call(canvas, 'ALT' + SHIFT, event.altKey);
+            }
+            return canvas.currentKeys.slice();
+        }
+    });
+    return object;
+}
+
 function getCachedContext(canvasElement, contextAttributes) {
     var gc = canvasElement.getContext('2d', contextAttributes),
         props = {},
diff --git a/src/lib/SelectionModel.js b/src/lib/SelectionModel.js
index 4e62f79a8..7d24860b0 100644
--- a/src/lib/SelectionModel.js
+++ b/src/lib/SelectionModel.js
@@ -444,11 +444,10 @@ SelectionModel.prototype = {
      */
     getSelectedRows: function() {
         if (this.areAllRowsSelected()) {
-            var headerRows = this.grid.getHeaderRowCount();
-            var rowCount = this.grid.getRowCount() - headerRows;
+            var rowCount = this.grid.getRowCount();
             var result = new Array(rowCount);
             for (var i = 0; i < rowCount; i++) {
-                result[i] = i + headerRows;
+                result[i] = i;
             }
             return result;
         }
diff --git a/src/renderer/index.js b/src/renderer/index.js
index 25d5f5124..fccbfea5a 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -613,8 +613,8 @@ var Renderer = Base.extend('Renderer', {
             return;
         }
 
-        var vci = this.visibleColumnsByIndex,
-            vri = this.visibleRowsByDataRowIndex,
+        var vc, vci = this.visibleColumnsByIndex,
+            vr, vri = this.visibleRowsByDataRowIndex,
             lastScrollableColumn = this.visibleColumns[this.visibleColumns.length - 1], // last column in scrollable section
             lastScrollableRow = this.visibleRows[this.visibleRows.length - 1], // last row in scrollable data section
             firstScrollableColumn = vci[this.dataWindow.origin.x],
@@ -625,25 +625,33 @@ var Renderer = Base.extend('Renderer', {
 
         if (
             // entire selection scrolled out of view to left of visible columns; or
-            selection.corner.x < this.visibleColumns[0].columnIndex ||
+            (vc = this.visibleColumns[0]) &&
+            selection.corner.x < vc.columnIndex ||
 
             // entire selection scrolled out of view between fixed columns and scrollable columns; or
             fixedColumnCount &&
-            selection.origin.x > this.visibleColumns[fixedColumnCount - 1].columnIndex &&
+            firstScrollableColumn &&
+            (vc = this.visibleColumns[fixedColumnCount - 1]) &&
+            selection.origin.x > vc.columnIndex &&
             selection.corner.x < firstScrollableColumn.columnIndex ||
 
             // entire selection scrolled out of view to right of visible columns; or
+            lastScrollableColumn &&
             selection.origin.x > lastScrollableColumn.columnIndex ||
 
             // entire selection scrolled out of view above visible rows; or
-            selection.corner.y < this.visibleRows[headerRowCount].rowIndex ||
+            (vr = this.visibleRows[headerRowCount]) &&
+            selection.corner.y < vr.rowIndex ||
 
             // entire selection scrolled out of view between fixed rows and scrollable rows; or
             fixedRowCount &&
-            selection.origin.y > this.visibleRows[headerRowCount + fixedRowCount - 1].rowIndex &&
+            firstScrollableRow &&
+            (vr = this.visibleRows[headerRowCount + fixedRowCount - 1]) &&
+            selection.origin.y > vr.rowIndex &&
             selection.corner.y < firstScrollableRow.rowIndex ||
 
             // entire selection scrolled out of view below visible rows
+            lastScrollableRow &&
             selection.origin.y > lastScrollableRow.rowIndex
         ) {
             return;
@@ -654,6 +662,10 @@ var Renderer = Base.extend('Renderer', {
             vcCorner = vci[selection.corner.x] || (selection.corner.x > lastScrollableColumn.columnIndex ? lastScrollableColumn : vci[fixedColumnCount - 1]),
             vrCorner = vri[selection.corner.y] || (selection.corner.y > lastScrollableRow.rowIndex ? lastScrollableRow : vri[fixedRowCount - 1]);
 
+        if (!(vcOrigin && vrOrigin && vcCorner && vrCorner)) {
+            return;
+        }
+
         // Render the selection model around the bounds
         var config = {
             bounds: {