diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5b3e7b42..c9bd60cd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,11 +6,22 @@
      plugin is for IDEA versions 14.1.5, 14.1.6, and 14.1.7.
   </p>
 
+  <p>0.11.0.RC-2: (community release)</p>
+  <ul>
+    <li>Properly parse and evaluate compiler conditionals (#if...#else...#end)</li>
+    <li>Resolve array access with types other than "Array."</li>
+    <li>Better 'Main class' chooser for the 'Project Settings->Haxe Compiler' dialog.</li>
+    <li>Fix property getter/setter quick-fixes.</li>
+    <li>Add location data, if known, to compiler completion error messages.</li>
+    <li>Display available completions even when the compiler reports an error.</li>
+    <li>Fixed incomplete results from a compiler run.</li>
+    <li>Better logic for removing duplicate entries from completion lists.</li>
+  </ul>
   <p>0.11.0.RC-1: (community release)</p>
   <ul>
     <li>Better code completion using the compiler -- OFF BY DEFAULT!  Turn on in File->Project Structure...</li>
     <li>Fix parsing of all compiler conditionals. (#417, #121, partly #115, and others)</li>
-    <li>Fix parsing of one-liner conditional complation style (issue #417, #121, partly #115)</li>
+    <li>Fix parsing of one-liner conditional compilation style (issue #417, #121, partly #115)</li>
     <li>Support for `@:require` haxe_ver comparing (issue #418)</li>
     <li>Support for `@:require` and `@:jsRequire` with multiple arguments</li>
     <li>Better handling of closing parens, brackets, quotes. (Issues #545, 546)</li>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ab32002dd..ddc8a250b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -36,7 +36,7 @@ Install the following plugins [from Intellij IDEA plugin manager](https://www.je
 - Plugin DevKit
 - UI Designer
 - Ant Support
-- Grammar-Kit (for bnf compilation) version 1.2.0. (Later versions have not been tested.)
+- Grammar-Kit (for bnf compilation) version 1.2.0. (Later versions are not backward compatible with IDEA 14.)
 
 ####Testing
 - JUnit
@@ -66,6 +66,21 @@ add the following lines to the end of the
     idea.is.internal=true
 
 
+Sometimes, when testing, the secondary instance of IDEA (running the plugin you're debugging) won't turn
+on the PSI viewer when that property is actually set.  You can always enable it by adding
+  `-Didea.is.internal=true`
+to the "VM Options" field in the 'Run->Edit Configurations...' dialog.
+
+####Disable ProcessCanceledExceptions
+
+Eventually, you may run into the frustrating situation where your stepping takes longer than
+IDEA's timeout and will try to cancel the process you're debugging.  This can be disabled by adding
+  `-Didea.ProcessCanceledException=disabled`
+to the same "VM Options" field.
+
+See [JetBrains' documentation for the 'idea.properties' file.](https://www.jetbrains.com/help/idea/2017.1/file-idea-properties.html) for
+other goodies and their suggested methods for modifying properties.
+
 ####Incompatibilities
 Do NOT install the haxe support plugin if you want to hack on it.  The installed plugin will be loaded and
 override your newly built one.  Running the "Haxe" plugin can only use the version you've built if there
@@ -169,10 +184,12 @@ Pick the first instance of idea.ultimate.build that is set from the following lo
 exists in the grandparent directory.  
 - `./idea-IU/` relative to the project root directory.
 
-Once the `${idea.ultimate.build}` property is set, the existence of `build.txt` is checked. 
-If `build.txt` cannot be found, then the error message you see above is displayed.
+Once the `${idea.ultimate.build}` property is set, the existence of `build.txt` is checked.
+If `build.txt` cannot be found, then the error message you see above is displayed.  (On MacOS,
+the build file is located in a slightly different place within IDEA's app directory.  The
+ant build knows how to find it.)
 
-In any case, `build.txt` MUST exist in your installation directory.  If it does not, 
+In any case, `build.txt` MUST exist in your installation directory.  If it does not,
 then your installation is corrupt.  You should consider re-installing IDEA.  Failing that,
 you can create one. It is a single line file with the following format:
 
@@ -208,7 +225,7 @@ Here is a minimalist example:
       <property name="idea.ultimate.build" location="/home/username/intellij_idea/idea-IU-135.1286/" />
     </project>
 
-Here is one from one of our team members:
+Here is a version from one of our team members:
 
     <project name="local-overrides">
       <echo>
@@ -513,9 +530,9 @@ applying your changes against the master branch.
 6. Create a pull request, and wait for comments.
 7. If you get comments that require changes, address those and return to step 2.
 8. When you get an “OK to merge,” or "approved," message from anyone on the team: Boyan, @as3boyan;
-Eric, @EBatTiVo; Ilya, @EliasKu (others as they become regular contributors,) go ahead
+Eric, @EricBishton; Ilya, @EliasKu (others as they become regular contributors,) go ahead
 and merge your changes to master.  A clean merge requires no further testing,
-as Travis-ci will do it for you.  However any build break must be addressed immediately.  A build 
+as Travis-ci will do it for you.  However any build break must be addressed immediately.  A build
 that has conflicts requires manual resolution and must be re-tested locally prior to push.  For regular
 team members, the original requester will be the person to merge since they are best suited to address
 conflicts.  Merges from occasional contributors will be merged by a team member as time and
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 9e31c19d9..3be373733 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -2,12 +2,14 @@ Recent contributors
 -----------------------------------
  - as3boyan <denis.flash.as3@gmail.com>
  - bynuff <igor.bulankov@gmail.com>
+ - David Nemcok <nemcok.david@gmail.com>
  - EBatTiVo <ebishton@tivo.com>
  - Eric B <ebishton@tivo.com>
  - Eric Bishton <ebishton@Erics-MacBook-Pro.local>
  - Eric Bishton <ebishton@ix.netcom.com>
  - GitHub <noreply@github.com>
  - Ilya Kuzmichev <deadbabe@gmail.com>
+ - mayakwd <loremipsum.inside@gmail.com>
  - slavara <ratdg@ya.ru>
  - Usievaład Čorny <anibyl@riseup.net>
  - Usievaład Kimajeŭ <usievalad@gmail.com>
@@ -27,6 +29,7 @@ All contributors
 - Carlos Ballesteros Velasco <soywiz@gmail.com>
 - Chris Decoster <impaler777@gmail.com>
 - Constantine Plotnikov <constantine.plotnikov@gmail.com>
+- David Nemcok <nemcok.david@gmail.com>
 - Denis.Zhdanov <denzhdanov@gmail.com>
 - Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
 - Dmitry Jemerov <yole@jetbrains.com>
@@ -61,6 +64,7 @@ All contributors
 - Kirill Safonov <kirill.safonov@jetbrains.com>
 - Maxim.Mossienko <Maxim.Mossienko@jetbrains.com>
 - Maxim Shafirov <max@jetbrains.com>
+- mayakwd <loremipsum.inside@gmail.com>
 - nik <Nikolay.Chashnikov@jetbrains.com>
 - Oleg Sukhodolsky <oleg.sukhodolsky@jetbrains.com>
 - peter <peter@jetbrains.com>
diff --git a/README.md b/README.md
index f18348ff8..21d52d930 100644
--- a/README.md
+++ b/README.md
@@ -5,9 +5,14 @@ This plugin allows you to develop [Haxe](http://haxe.org/) programs with Intelli
 It requires Intellij IDEA Ultimate or Community Edition, versions 14, 15, IDEA 2016.1 through 2016.3.
 
 #### We have moved!
-The primary maintained branch of this plugin has moved to the HaxeFoundation.  Please update your 
+The primary maintained branch of this plugin has moved to the Haxe Foundation's github repository.  Please update your
 links and git clones to point to [http://github.com/HaxeFoundation/intellij-haxe](http://github.com/HaxeFoundation/intellij-haxe)
 
+#### Professional Support
+The Haxe plugin for IDEA is professionally maintained and supported by [Bishton Software Solutions](http://BishtonSoftwareSolutions.com).
+When you or your business have needs that the plugin does not meet, they offer short- and  long-term technical support
+and custom development services.  They can also help with your other tooling or development needs.
+
 
 Install
 -------
@@ -55,6 +60,8 @@ If you already have a project open IDEA:
 
 Build
 -----
+Note that installation as described above installs a fully built version of the plugin (the .jar file).  Most users do not have to
+build the product for themselves.  This section is for those who like to dig a little deeper.
 
 This describes the command line build on a Linux platform. To build from within Intellij IDEA itself, see the [contributing](CONTRIBUTING.md) document to setup
 your development environment.  Much more detail is provided there for command line build options as well.
diff --git a/src/META-INF/plugin.xml b/src/META-INF/plugin.xml
index aa3a21310..2a4bde795 100644
--- a/src/META-INF/plugin.xml
+++ b/src/META-INF/plugin.xml
@@ -2,6 +2,7 @@
   ~ Copyright 2000-2013 JetBrains s.r.o.
   ~ Copyright 2014-2014 AS3Boyan
   ~ Copyright 2014-2014 Elias Ku
+  ~ Copyright 2017 Eric Bishton
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -29,19 +30,31 @@
   <depends optional="true" config-file="flex-debugger-support.xml">com.intellij.flex</depends>
   <depends optional="true" config-file="debugger-support.xml">com.intellij.modules.ultimate</depends>
 
-  <version>0.11.0.RC-1 for @plugin.compatibility.description@</version>
+  <version>0.11.0.RC-2 for @plugin.compatibility.description@</version>
   <change-notes>
     <![CDATA[
       <p>This jar is compatible with @plugin.compatibility.description@</p>
       <p>It was built using IDEA build @idea.sdk.version@</p>
-      <p>Documentation: http://github.com/HaxeFoundation/intellij-haxe/README.md.</p>
-      <p>Support: http://github.com/HaxeFoundation/intellij-haxe/issues.</p>
+      <p>Documentation: <a href="https://github.com/HaxeFoundation/intellij-haxe/blob/master/README.md">https://github.com/HaxeFoundation/intellij-haxe/blob/master/README.md</a></p>
+      <p>Support: <a href="https://github.com/HaxeFoundation/intellij-haxe/issues">https://github.com/HaxeFoundation/intellij-haxe/issues</a></p>
+      <p>Professionally maintained by Bishton Software Solutions: <a href="http://BishtonSoftwareSolutions.com">http://BishtonSoftwareSolutions.com</a></p>
       <p/>
+      <p>0.11.0.RC-2: (community release)</p>
+      <ul>
+        <li>Properly parse and evaluate compiler conditionals (#if...#else...#end)</li>
+        <li>Resolve array access with types other than "Array."</li>
+        <li>Better 'Main class' chooser for the 'Project Settings->Haxe Compiler' dialog.</li>
+        <li>Fix property getter/setter quick-fixes.</li>
+        <li>Add location data, if known, to compiler completion error messages.</li>
+        <li>Display available completions even when the compiler reports an error.</li>
+        <li>Fixed incomplete results from a compiler run.</li>
+        <li>Better logic for removing duplicate entries from completion lists.</li>
+      </ul>
       <p>0.11.0.RC-1: (community release)</p>
       <ul>
         <li>Better code completion using the compiler -- OFF BY DEFAULT!  Turn on in File->Project Structure...</li>
         <li>Fix parsing of all compiler conditionals. (#417, #121, partly #115, and others)</li>
-        <li>Fix parsing of one-liner conditional complation style (issue #417, #121, partly #115)</li>
+        <li>Fix parsing of one-liner conditional compilation style (issue #417, #121, partly #115)</li>
         <li>Support for `@:require` haxe_ver comparing (issue #418)</li>
         <li>Support for `@:require` and `@:jsRequire` with multiple arguments</li>
         <li>Better handling of closing parens, brackets, quotes. (Issues #545, 546)</li>