diff --git a/addons/xterm-addon-search/typings/xterm-addon-search.d.ts b/addons/xterm-addon-search/typings/xterm-addon-search.d.ts
index 94bc529718..f27aba7834 100644
--- a/addons/xterm-addon-search/typings/xterm-addon-search.d.ts
+++ b/addons/xterm-addon-search/typings/xterm-addon-search.d.ts
@@ -17,7 +17,7 @@ declare module 'xterm-addon-search' {
 
     /**
      * Whether to search for a whole word, the result is only valid if it's
-     * suppounded in "non-word" characters such as `_`, `(`, `)` or space.
+     * surrounded in "non-word" characters such as `_`, `(`, `)` or space.
      */
     wholeWord?: boolean;
 
@@ -27,7 +27,7 @@ declare module 'xterm-addon-search' {
     caseSensitive?: boolean;
 
     /**
-     * Whether to do an indcremental search, this will expand the selection if it
+     * Whether to do an incremental search, this will expand the selection if it
      * still matches the term the user typed. Note that this only affects
      * `findNext`, not `findPrevious`.
      */
diff --git a/src/common/EventEmitter.ts b/src/common/EventEmitter.ts
index 34ac190f15..5991e338d1 100644
--- a/src/common/EventEmitter.ts
+++ b/src/common/EventEmitter.ts
@@ -16,11 +16,13 @@ export interface IEvent<T> {
 export interface IEventEmitter<T> {
   event: IEvent<T>;
   fire(data: T): void;
+  dispose(): void;
 }
 
 export class EventEmitter<T> implements IEventEmitter<T> {
   private _listeners: IListener<T>[] = [];
   private _event?: IEvent<T>;
+  private _disposed: boolean = false;
 
   public get event(): IEvent<T> {
     if (!this._event) {
@@ -28,10 +30,12 @@ export class EventEmitter<T> implements IEventEmitter<T> {
         this._listeners.push(listener);
         const disposable = {
           dispose: () => {
-            for (let i = 0; i < this._listeners.length; i++) {
-              if (this._listeners[i] === listener) {
-                this._listeners.splice(i, 1);
-                return;
+            if (!this._disposed) {
+              for (let i = 0; i < this._listeners.length; i++) {
+                if (this._listeners[i] === listener) {
+                  this._listeners.splice(i, 1);
+                  return;
+                }
               }
             }
           }
@@ -51,4 +55,11 @@ export class EventEmitter<T> implements IEventEmitter<T> {
       queue[i].call(undefined, data);
     }
   }
+
+  public dispose(): void {
+    if (this._listeners) {
+      this._listeners.length = 0;
+    }
+    this._disposed = true;
+  }
 }
diff --git a/typings/xterm.d.ts b/typings/xterm.d.ts
index 295a03b278..9728a72cb5 100644
--- a/typings/xterm.d.ts
+++ b/typings/xterm.d.ts
@@ -49,7 +49,7 @@ declare module 'xterm' {
 
     /**
      * When enabled the cursor will be set to the beginning of the next line
-     * with every new line. This equivalent to sending '\r\n' for each '\n'.
+     * with every new line. This is equivalent to sending '\r\n' for each '\n'.
      * Normally the termios settings of the underlying PTY deals with the
      * translation of '\n' to '\r\n' and this setting should not be used. If you
      * deal with data from a non-PTY related source, this settings might be
@@ -437,7 +437,7 @@ declare module 'xterm' {
     onData: IEvent<string>;
 
     /**
-     * Adds an event listener for a key is pressed. The event value contains the
+     * Adds an event listener for when a key is pressed. The event value contains the
      * string that will be sent in the data event as well as the DOM event that
      * triggered it.
      * @returns an `IDisposable` to stop listening.
@@ -609,7 +609,7 @@ declare module 'xterm' {
 
     /**
      * Selects text within the terminal.
-     * @param column The column the selection starts at..
+     * @param column The column the selection starts at.
      * @param row The row the selection starts at.
      * @param length The length of the selection.
      */
@@ -918,7 +918,7 @@ declare module 'xterm' {
 
     /**
      * The line within the buffer where the top of the bottom page is (when
-     * fully scrolled down);
+     * fully scrolled down).
      */
     readonly baseY: number;
 
@@ -1047,7 +1047,7 @@ declare module 'xterm' {
      * array will contain subarrays with their numercial values.
      * Return true if the sequence was handled; false if we should try
      * a previous handler (set by addCsiHandler or setCsiHandler).
-     * The most recently-added handler is tried first.
+     * The most recently added handler is tried first.
      * @return An IDisposable you can call to remove this handler.
      */
     addCsiHandler(id: IFunctionIdentifier, callback: (params: (number | number[])[]) => boolean): IDisposable;
@@ -1066,7 +1066,7 @@ declare module 'xterm' {
      * The function gets the payload and numerical parameters as arguments.
      * Return true if the sequence was handled; false if we should try
      * a previous handler (set by addDcsHandler or setDcsHandler).
-     * The most recently-added handler is tried first.
+     * The most recently added handler is tried first.
      * @return An IDisposable you can call to remove this handler.
      */
     addDcsHandler(id: IFunctionIdentifier, callback: (data: string, param: (number | number[])[]) => boolean): IDisposable;
@@ -1079,7 +1079,7 @@ declare module 'xterm' {
      * @param callback The function to handle the sequence.
      * Return true if the sequence was handled; false if we should try
      * a previous handler (set by addEscHandler or setEscHandler).
-     * The most recently-added handler is tried first.
+     * The most recently added handler is tried first.
      * @return An IDisposable you can call to remove this handler.
      */
     addEscHandler(id: IFunctionIdentifier, handler: () => boolean): IDisposable;
@@ -1097,7 +1097,7 @@ declare module 'xterm' {
      * The callback is called with OSC data string.
      * Return true if the sequence was handled; false if we should try
      * a previous handler (set by addOscHandler or setOscHandler).
-     * The most recently-added handler is tried first.
+     * The most recently added handler is tried first.
      * @return An IDisposable you can call to remove this handler.
      */
     addOscHandler(ident: number, callback: (data: string) => boolean): IDisposable;