diff --git a/css/VisualEvent.css b/css/VisualEvent.css
index a556d75..8c969cc 100644
--- a/css/VisualEvent.css
+++ b/css/VisualEvent.css
@@ -302,3 +302,8 @@ div.Event_LabelColour {
 #Event_Display div.Event_bg_black:hover {
 	border: rgba(190, 190, 190, 1) 2px solid;
 }
+
+#Event_Display div.EventLabel {
+	position: absolute;
+	font: 14px sans-serif;
+}
diff --git a/js/VisualEvent.js b/js/VisualEvent.js
index 46595e0..cb75c7d 100644
--- a/js/VisualEvent.js
+++ b/js/VisualEvent.js
@@ -16,37 +16,37 @@
 (function(window, document, $){
 
 
-/** 
+/**
  * Visual Event will show, visually, which DOM elements on a web-page have events attached to
- * them, information about those events and the code accossiated with each handler for the 
+ * them, information about those events and the code associated with each handler for the
  * event. It does this by parsing through the cache of Javascript libraries (as there is no DOM
  * method to get the information required), thus a major part of Visual Event are the library
  * parsers. A result of this is that universal display of events is not possible - there must
  * be a parser available.
- * 
+ *
  * Visual Event's display is broken into four major areas:
  *   - Label - The information toolbar at the bottom of the window (fixed) showing Visual Event
  * controls (close and help), the name of the program and information about the events that have
  * been found on the page.
- * 
+ *
  *   - Help - The help view is a completely blocking layer which shows information about Visual
  * Event and how to use it. A single click will remove the help layer and restore the standard
  * Visual Event view.
- * 
- *   - Display - A layer which provides a background to Visual Event (thus when Visual Event is 
+ *
+ *   - Display - A layer which provides a background to Visual Event (thus when Visual Event is
  * active is it blocking to the web-page below it) and acts as a container for the boxes (DIVs)
  * which serve as a visual indicator that there is an event attached to the element below it
  * (sized to match the element with the event attached).
- * 
+ *
  *   - Lightbox - The event information and code display of attached events.
- * 
- * Note that currently there can only be one instance of Visual Event at a time, due to 
+ *
+ * Note that currently there can only be one instance of Visual Event at a time, due to
  * practicality (no point in showing the same thing twice, at the same time) and the use of
  * element IDs in the script.
- * 
+ *
  *  @class VisualEvent
  *  @constructor
- * 
+ *
  *  @example
  * 		new VisualEvent();
 */
@@ -57,21 +57,21 @@ window.VisualEvent = function ()
 		alert( "VisualEvent warning: Must be initialised with the 'new' keyword." );
 		return;
 	}
-	
+
 	// Only one instance of VisualEvent at a time, in the current running mode. So if there is a
 	// current instance, shut it down first
 	if ( VisualEvent.instance !== null ) {
 		VisualEvent.instance.close();
 	}
 	VisualEvent.instance = this;
-	
-	
+
+
 	/**
 	 * Settings object containing customisable information for the class instance
 	 * @namespace
 	 */
 	this.s = {
-		/** 
+		/**
 		 * Array of objects containing information about the nodes which have been found to have
 		 * events attached to them. Each object contains the following parameters:
 		 *   {element} node The DOM element in question
@@ -84,16 +84,16 @@ window.VisualEvent = function ()
 		 *  @default  null
 		 */
 		"elements": null,
-		
-		/** 
+
+		/**
 		 * setTimeout reference for delayed hiding of the lightbox layer
 		 *  @type     int
 		 *  @default  null
 		 *  @private
 		 */
 		"mouseTimer": null,
-		
-		/** 
+
+		/**
 		 * Counter for the number of events which have been found from a JS library's cache, but
 		 * are not currently available in the document's DOM
 		 *  @type     int
@@ -101,8 +101,8 @@ window.VisualEvent = function ()
 		 *  @private
 		 */
 		"nonDomEvents": 0,
-		
-		/** 
+
+		/**
 		 * Array of objects holding information about each SCRIPT tag that is found in the DOM. Each
 		 * object contains the parameters:
 		 *   {string} src The URL of the script source (or inline string if no src attribute)
@@ -113,7 +113,7 @@ window.VisualEvent = function ()
 		 */
 		"scripts": []
 	};
-	
+
 	/**
 	 * DOM elements used by the class instance
 	 * @namespace
@@ -134,14 +134,14 @@ window.VisualEvent = function ()
 				'<span class="Event_LabelNodes"></span> nodes. '+
 				'<span class="Event_LabelNonDom"></span> events were attached to elements not currently in the document.'+
 			'</div>')[0],
-		
+
 		/**
 		 * Display layer - background layer and container for Visual Event visual node indicators
 		 *  @type     element
 		 *  @default  See code
 		 */
 		"display": $('<div id="Event_Display"></div>')[0],
-		
+
 		/**
 		 * Lightbox layer - Template for information display about a given node, and the code for
 		 * a given event handler
@@ -160,7 +160,7 @@ window.VisualEvent = function ()
 				'</div>'+
 				'<div class="Event_Code"></div>'+
 			'</div>')[0],
-			
+
 		/**
 		 * Help layer - information about Visual Event and how to use it
 		 *  @type     element
@@ -227,7 +227,7 @@ window.VisualEvent = function ()
 					'<p class="Event_HelpClose">Click anywhere to close this help box.</p>'+
 				'</div>'+
 			'</div>')[0],
-			
+
 
 		/**
 		 * Reference to the visual event node indicator - so we have a reference to what node we are
@@ -237,7 +237,7 @@ window.VisualEvent = function ()
 		 */
 		"activeEventNode": null
 	};
-	
+
 	this._construct();
 };
 
@@ -246,7 +246,7 @@ VisualEvent.prototype = {
 	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 	 * API methods
 	 */
-	
+
 	/**
 	 * Shutdown Visual Event and return to the original page
 	 * @param {event} e Event object
@@ -261,15 +261,15 @@ VisualEvent.prototype = {
 		$(this.dom.lightbox).remove();
 		$(this.dom.label).remove();
 		$(this.dom.help).remove();
-		
+
 		if ( typeof VisualEvent_Loader !== 'undefined' && !VisualEvent_Loader.jQueryPreLoaded ) {
 			$.noConflict();
 		}
-		
+
 		VisualEvent.instance = null;
 	},
-	
-	
+
+
 	/**
 	 * Reinitialise Visual Event (i.e. bring it up-to-date with any new events which might have
 	 *   been added
@@ -287,15 +287,15 @@ VisualEvent.prototype = {
 
 		this.s.elements.splice(0, this.s.elements.length);
 		this.s.nonDomEvents = 0;
-			
+
 		this._construct();
 	},
-	
-	
+
+
 	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 	 * Private methods
 	 */
-	
+
 	/**
 	 * Visual Event constructor
 	 *  @private
@@ -306,15 +306,15 @@ VisualEvent.prototype = {
 		var i, iLen;
 		var windowHeight = $(document).height();
 		var windowWidth = $(document).width();
-		
+
 		/* Prep the DOM */
 		this.dom.display.style.width = windowWidth+'px';
 		this.dom.display.style.height = windowHeight+'px';
-		
+
 		document.body.appendChild( this.dom.display );
 		document.body.appendChild( this.dom.lightbox );
 		document.body.appendChild( this.dom.label );
-		
+
 		/* Event handlers */
 		$(this.dom.lightbox).bind('mouseover.VisualEvent', function (e) {
 			that._timerClear( e );
@@ -323,12 +323,12 @@ VisualEvent.prototype = {
 		} ).bind( 'mouseout.VisualEvent', function (e) {
 			that._lightboxHide();
 		} );
-		
+
 		$('div.Event_NodeRemove', this.dom.lightbox).bind('click.VisualEvent', function (e) {
 			that.dom.activeEventNode.style.display = "none";
 			that.dom.lightbox.style.display = "none";
 		} );
-		
+
 		$(document).bind( 'keydown.VisualEvent', function( e ) {
 			if ( e.which === 0 || e.which === 27 ) { // esc
 				that.close();
@@ -349,24 +349,24 @@ VisualEvent.prototype = {
 				that.reInit();
 			}
 		} );
-		
+
 		/* Build the events list and display */
 		this.s.elements = this._eventsLoad();
 		for ( i=0, iLen=this.s.elements.length ; i<iLen ; i++ ) {
 			this._eventElement( this.s.elements[i] );
 		}
-		
+
 		this._renderLabel();
-		
+
 		/* Load the text of all the Javascript on the page so we can try to find source */
 		this._scriptsLoad();
 	},
-	
-	
+
+
 	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 	 * User help
 	 */
-	
+
 	/**
 	 * Show the help box
 	 *  @private
@@ -374,8 +374,8 @@ VisualEvent.prototype = {
 	"_help": function () {
 		document.body.appendChild( this.dom.help );
 	},
-	
-	
+
+
 	/**
 	 * Hide hte help box
 	 *  @private
@@ -383,13 +383,13 @@ VisualEvent.prototype = {
 	"_hideHelp": function () {
 		document.body.removeChild( this.dom.help );
 	},
-	
-	
-	
+
+
+
 	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 	 * Javascript source handling
 	 */
-	
+
 	/**
 	 * Parse the DOM for script tags and store the Javascript that is found. For any scripts which
 	 * have a 'src' attribute, add them to a queue for Ajax loading and then start the queue running
@@ -417,11 +417,11 @@ VisualEvent.prototype = {
 				} );
 			}
 		}
-		
+
 		this._scriptLoadQueue( loadQueue );
 	},
-	
-	
+
+
 	/**
 	 * Pull an item off the script loading queue and load it up by an Ajax return. When done, loop
 	 * back and load the next item off the queue, until all done.
@@ -433,14 +433,14 @@ VisualEvent.prototype = {
 		if ( loadQueue.length === 0 ) {
 			return;
 		}
-		
+
 		var that = this;
 		var url = loadQueue.shift();
 
 		$.ajax( {
-			"dataType": 'text', 
-			"type": "GET", 
-			"url": url, 
+			"dataType": 'text',
+			"type": "GET",
+			"url": url,
 			"success": function (text) {
 				that.s.scripts.push( {
 					"src": url,
@@ -453,8 +453,8 @@ VisualEvent.prototype = {
 			}
 		} );
 	},
-	
-	
+
+
 	/**
 	 * Attempt to find the source location (file and line number) for a given function and
 	 * format a return string which is human readable explaining where the source might come from
@@ -466,29 +466,30 @@ VisualEvent.prototype = {
 	{
 		var origin = "";
 		var srcFiles = [];
-		var i, iLen, a;
-		
+		var i, iLen, script, pos;
+
 		// Webkit reformats the prototype for the function, so the whitespace might not match our
 		// intended target. Remove the prototype - it means we are more likely to get a clash, but
 		// don't see much choice if we want to do matching other than trying all variations
 		if ( $.browser.webkit ) {
 			func = $.trim( func.replace(/^(function.*?\))/, '') );
 		}
-		
+
 		for ( i=0, iLen=this.s.scripts.length ; i<iLen ; i++ ) {
-			if ( this.s.scripts[i].code.indexOf( func ) !== -1 ) {
-				a = this.s.scripts[i].code.split( func );
+			script = this.s.scripts[i];
+			pos = script.code.indexOf( func );
+			if ( pos !== -1 ) {
 				srcFiles.push( {
-					"src": this.s.scripts[i].src,
-					"line": a[0].split('\n').length
+					"src": script.src,
+					"line": script.code.substr(0, pos).split('\n').length
 				} );
 			}
 		}
-		
+
 		// Firefox reformats the functions from toString() rather than keeping the original format
 		// so we'll never be able to find the original. Should we just return an empty string
 		// for Firefox?
-		
+
 		if ( srcFiles.length === 0 ) {
 			origin = "Function definition could not be found automatically<br/>";
 		} else if ( srcFiles.length === 1 ) {
@@ -501,11 +502,11 @@ VisualEvent.prototype = {
 					' in <a href="'+srcFiles[0].src+'">'+this._scriptName(srcFiles[0].src)+'</a><br/>';
 			}
 		}
-		
+
 		return origin;
 	},
-	
-	
+
+
 	/**
 	 * Get the name of a file from a URL (i.e. the last part in a slash seperated string)
 	 *  @param {string} src URL to get the file name from
@@ -517,13 +518,13 @@ VisualEvent.prototype = {
 		var a = src.split('/');
 		return a[ a.length-1 ];
 	},
-	
-	
-	
+
+
+
 	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 	 * Display
 	 */
-	
+
 	/**
 	 * Build the list of nodes that have events attached to them by going through all installed
 	 * parsers
@@ -534,7 +535,7 @@ VisualEvent.prototype = {
 	{
 		var i, iLen;
 		var elements=[], libraryListeners;
-		
+
 		/* Gather the events from the supported libraries */
 		for ( i=0, iLen=VisualEvent.parsers.length ; i<iLen ; i++ ) {
 			// Given the millions of environments that the parsers will run in, it is quite possible one
@@ -544,22 +545,45 @@ VisualEvent.prototype = {
 				elements = elements.concat( libraryListeners );
 			} catch (e) {}
 		}
-		
+
 		/* Add the API array information - if it is available */
 		if ( typeof VisualEvents == 'object' ) {
 			if ( this._ceckIntegrity( VisualEvents ) ) {
 				elements = this._combineEvents( elements, VisualEvents );
 			}
 		}
-		
+
 		/* Group the events */
 		return this._merge( elements );
 	},
-	
-	
+
+
+	"_nodeInfo": function ( node )
+	{
+		var info;
+		if (node == window) {
+			info = {left: 0, top: 0, width: 60, height: 16, text: "window"};
+		} else if (node == document) {
+			info = {left: 0, top: 20, width: 60, height: 16, text: "#document"};
+		} else {
+			info = $(node).offset();
+			/* If dealing with the html or body tags, don't paint over the whole screen */
+			if (node != document.body && node != document.documentElement) {
+				info.width = node.offsetWidth - 4;
+				info.height = node.offsetHeight - 4;
+			} else {
+				info.width = 20;
+				info.height = 20;
+			}
+			info.text = "";
+		}
+		return info;
+	},
+
+
 	/**
 	 * A node has at least one event subscribed to it - draw it visually
-	 *  @param {object} eventNode Event information for this node in the same format as 
+	 *  @param {object} eventNode Event information for this node in the same format as
 	 *    VisualEvent.s.elements objects
 	 *  @private
 	 */
@@ -569,27 +593,30 @@ VisualEvent.prototype = {
 		var i, iLen;
 		var pos;
 		var label;
-		
+
 		// Element is hidden
-		if ( $(eventNode.node).filter(':visible').length === 0 ) {
+		if ( !$(eventNode.node).is(':visible') ) {
+			if ($(eventNode.node).is('#Event_Lightbox, #Event_Lightbox *')) {
+				return;
+			}
+			if ( window.console && window.console.warn ) {
+				window.console.warn("Event on invisible element", eventNode.node, eventNode);
+			}
 			this.s.nonDomEvents += 1;
 			return;
 		}
-		
-		pos = $(eventNode.node).offset();
-		
+
+		pos = this._nodeInfo(eventNode.node);
+
 		label = document.createElement( 'div' );
-		label.style.position = "absolute";
 		label.style.top = pos.top+"px";
 		label.style.left = pos.left+"px";
+		label.style.width = pos.width+"px";
+		label.style.height = pos.height+"px";
 		label.className = 'EventLabel Event_bg_'+this._getColorFromTypes( eventNode.listeners );
-		
-		/* If dealing with the html or body tags, don't paint over the whole screen */
-		if ( eventNode.node != document.body && eventNode.node != document.documentElement ) {
-			label.style.width = (eventNode.node.offsetWidth-4)+'px';
-			label.style.height = (eventNode.node.offsetHeight-4)+'px';
-		}
-		
+
+		label.innerHTML = pos.text;
+
 		/* Event listeners for showing the lightbox for this element */
 		$(label).bind( 'dblclick.VisualEvent', function (e) {
 			this.style.display = "none";
@@ -600,17 +627,17 @@ VisualEvent.prototype = {
 		} ).bind( 'mouseout.VisualEvent', function (e) {
 			that._lightboxHide();
 		} );
-		
+
 		/* Finally have the html engine render our output */
 		this.dom.display.appendChild( label );
 	},
-	
-	
-	
+
+
+
 	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 	 * Lightbox
 	 */
-	
+
 	/**
 	 * Show the list of event types which are attached to this node and add event listeners to show
 	 * the code when required (mouseover on the list)
@@ -624,26 +651,26 @@ VisualEvent.prototype = {
 		var that = this;
 		var i, iLen;
 		var ul;
-		
+
 		this._timerClear();
-		
+
 		$('i', this.dom.lightbox).html( this._renderNodeInfo(node) );
 		$('div.Event_Code', this.dom.lightbox).empty();
-		
+
 		ul = $('ul', this.dom.lightbox).empty();
 		for ( i=0, iLen=listeners.length ; i<iLen ; i++ ) {
 			ul.append( $('<li>'+listeners[i].type+'</li>').bind( 'mouseover.VisualEvent',
 				this._lightboxCode(e, node, listeners[i]) )
 			);
 		}
-		
+
 		/* Show the code for the first event in the list */
 		$('li:eq(0)', this.dom.lightbox).mouseover();
-		
+
 		this._lightboxPosition( this.dom.lightbox, node );
 	},
-	
-	
+
+
 	/**
 	 * Create a function which will build the HTML needed for the display of the code for an
 	 * event handler
@@ -656,16 +683,16 @@ VisualEvent.prototype = {
 	"_lightboxCode": function ( e, node, listener )
 	{
 		var that = this;
-		
+
 		return function () {
 			$('li', this.parentNode).removeClass( 'Event_EventSelected' );
 			$(this).addClass( 'Event_EventSelected' );
-			
+
 			var evt = that._createEvent( e, listener.type, e.target );
-			that._renderCode( e, listener.func, listener.source, listener.type, 
+			that._renderCode( e, listener.func, listener.source, listener.type,
 				evt===null ? null : function() {
 					node.dispatchEvent(evt);
-					
+
 					// Might cause stuff to move around by the activation of the event, so re-init
 					setTimeout( function () {
 						that.reInit.call(that);
@@ -674,8 +701,8 @@ VisualEvent.prototype = {
 			);
 		};
 	},
-	
-	
+
+
 	/**
 	 * Position the lightbox relative to the element which has an event attached to it
 	 *  @param {element} target The lightbox node to move (note there is only one this.dom.lightbox
@@ -685,40 +712,40 @@ VisualEvent.prototype = {
 	 */
 	"_lightboxPosition": function ( target, parent )
 	{
-		var offset = $(parent).offset();
+		var offset = this._nodeInfo(parent);
 		var targetT = offset.top + 15; // magic number - height of info button
 		var targetL = offset.left;
 		var viewportW = $(window).width() - 25; // use window rather than document, since the target could cause the document to resize
 		var viewportH = $(document).height();
 		var targetW = $(target).width();
 		var targetH = $(target).height();
-		
+
 		// Correct for over-run
 		if ( targetL + targetW > viewportW ) {
 			targetL -= (targetL + targetW) - viewportW;
 		}
-		
+
 		if ( targetT + targetH > viewportH ) {
 			targetH -= (targetT + targetH) - viewportH;
 		}
-		
+
 		// Correct for under-run
 		if ( targetT < 0 ) {
 			targetT = 0;
 		}
-		
+
 		if ( targetL < 0 ) {
 			targetL = 0;
 		}
-		
+
 		target.style.top = targetT+'px';
 		target.style.left = targetL+'px';
 		target.style.display = 'block';
 	},
-	
-	
+
+
 	/**
-	 * Close the lightbox - use a cancellable timer for the hiding of the lightbox, so we can move 
+	 * Close the lightbox - use a cancellable timer for the hiding of the lightbox, so we can move
 	 * the mouse from element to element without having it flicker.
 	 *  @private
 	 */
@@ -730,13 +757,13 @@ VisualEvent.prototype = {
 			},
 		200 );
 	},
-	
-	
-	
+
+
+
 	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 	 * Rendering methods
 	 */
-	
+
 	/**
 	 * Display a tooltip with event information for a particular event handler
 	 *  @param {event} e Target node information
@@ -750,14 +777,14 @@ VisualEvent.prototype = {
 		var that = this;
 		var eventElement = e.target;
 		var i, iLen;
-		
+
 		this._timerClear( e );
-		
+
 		if ( trigger === null ) {
 			$('div.Event_Code', this.dom.lightbox).html( '<div id="Event_inner"><p><i>'+type+
 				'</i> event subscribed by '+source+'<br/>'+
 				this._scriptSource( func )+
-				'</p><pre id="Event_code" class="brush: js"></pre></div>' );	
+				'</p><pre id="Event_code" class="brush: js"></pre></div>' );
 		}
 		else {
 			$('div.Event_Code', this.dom.lightbox).html( '<div id="Event_inner"><p><i>'+type+
@@ -767,7 +794,7 @@ VisualEvent.prototype = {
 				'</p><pre id="Event_code" class="brush: js"></pre></div>' );
 			$('#Event_Trigger').bind( 'click.VisualEvent', trigger );
 		}
-		
+
 		/* Modify the function slightly such that the white space that is found at the start of the
 		 * last line in the function is also put at the start of the first line. This allows
 		 * SyntaxHighlighter to be cunning and remove the block white space - otherwise it is all
@@ -779,16 +806,16 @@ VisualEvent.prototype = {
 			lines[0] = last + lines[0];
 			func = lines.join('\n');
 		}
-		
+
 		/* Inject the function string here incase it includes a '</textarea>' string */
-		$('pre', this.dom.lightbox).html( 
+		$('pre', this.dom.lightbox).html(
 			func.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;')
 		);
-		
+
 		VisualEventSyntaxHighlighter.highlight( null, document.getElementById('Event_code') );
 	},
-	
-	
+
+
 	/**
 	 * Show information about a particular node - the node name, ID and class (if it has either/both
 	 * of the last two)
@@ -798,22 +825,29 @@ VisualEvent.prototype = {
 	 */
 	"_renderNodeInfo": function ( node )
 	{
+		if (node == window) {
+			return "window";
+		}
+		if (node == document) {
+			return "#document";
+		}
+
 		var s = node.nodeName.toLowerCase();
-		
+
 		var id = node.getAttribute('id');
 		if ( id && id !== '' ) {
 			s += '#'+id;
 		}
-		
+
 		var className = node.className;
 		if ( className !== '' ) {
 			s += '.'+className;
 		}
-		
+
 		return s;
 	},
-	
-	
+
+
 	/**
 	 * Display the Visual Event toolbar, writing in the required information and adding the event
 	 * handlers as needed
@@ -823,35 +857,35 @@ VisualEvent.prototype = {
 	{
 		var that = this,
 			events = 0, i, iLen;
-		
-		for (i=0, iLen=this.s.elements.length ; i<iLen ; i++ ) {
+
+		for ( i=0, iLen=this.s.elements.length ; i<iLen ; i++ ) {
 			events += this.s.elements[i].listeners.length;
 		}
-		
+
 		$('span.Event_LabelEvents', this.dom.label).html( events );
 		$('span.Event_LabelNodes', this.dom.label).html( this.s.elements.length );
 		$('span.Event_LabelNonDom', this.dom.label).html( this.s.nonDomEvents );
-		
+
 		//this.dom.label.innerHTML = "Visual Event";
 		$('span.Event_LabelClose', this.dom.label).bind( 'click.VisualEvent', function () {
 			that.close();
 		} );
-		
+
 		$('span.Event_LabelHelp', this.dom.label).bind( 'click.VisualEvent', function () {
 			that._help();
 		} );
-		
+
 		$(this.dom.help).bind( 'click.VisualEvent', function () {
 			that._hideHelp();
 		} );
 	},
-	
-	
-	
+
+
+
 	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 	 * Support methods
 	 */
-	
+
 	/**
 	 * Create an event oject based on the type to trigger an event - cross-platform
 	 *  @param {event} originalEvt The original event (click) which cased this function to run
@@ -865,26 +899,26 @@ VisualEvent.prototype = {
 		var evt = null;
 		var offset = $(target).offset();
 		var typeGroup = this._eventTypeGroup( type );
-		
+
 		if ( document.createEvent ) {
 			switch ( typeGroup ) {
 				case 'mouse':
 					evt = document.createEvent( "MouseEvents" );
-					evt.initMouseEvent( type, true, true, window, 0, offset.left, offset.top, 
-						offset.left, offset.top, originalEvt.ctrlKey, originalEvt.altKey, originalEvt.shiftKey, 
+					evt.initMouseEvent( type, true, true, window, 0, offset.left, offset.top,
+						offset.left, offset.top, originalEvt.ctrlKey, originalEvt.altKey, originalEvt.shiftKey,
 						originalEvt.metaKey, originalEvt.button, null );
 					break;
-				
+
 				case 'html':
 					evt = document.createEvent( "HTMLEvents" );
 					evt.initEvent( type, true, true );
 					break;
-					
+
 				case 'ui':
 					evt = document.createEvent( "UIEvents" );
 					evt.initUIEvent( type, true, true, window, 0 );
 					break;
-				
+
 				default:
 					break;
 			}
@@ -903,23 +937,23 @@ VisualEvent.prototype = {
 					evt.button = originalEvt.button;
 					evt.relatedTarget = null;
 					break;
-				
+
 				case 'html':
 					/* fall through to basic event object */
-					
+
 				case 'ui':
 					evt = document.createEventObject();
 					break;
-				
+
 				default:
 					break;
 			}
 		}
-		
+
 		return evt;
 	},
-	
-	
+
+
 	/**
 	 * Cancel tooltip mouse timer
 	 *  @param {event} e Mouse event
@@ -932,8 +966,8 @@ VisualEvent.prototype = {
 			this.s.mouseTimer = null;
 		}
 	},
-	
-	
+
+
 	/**
 	 * Combine the main events array, so that each node only has one element
 	 *  @param {array} main The main source array
@@ -944,10 +978,10 @@ VisualEvent.prototype = {
 	{
 		var ret = [];
 		var found, i, iLen, j, jLen;
-		
+
 		for ( i=0, iLen=main.length ; i<iLen ; i++ ) {
 			found = false;
-			
+
 			for ( j=0, jLen=ret.length ; j<jLen ; j++ ) {
 				if ( ret[j].node == main[i].node ) {
 					ret[j].listeners = ret[j].listeners.concat( main[i].listeners );
@@ -955,19 +989,19 @@ VisualEvent.prototype = {
 					break;
 				}
 			}
-			
+
 			if ( !found ) {
 				ret.push( main[i] );
 			}
 		}
-		
+
 		return ret;
 	},
-	
-	
+
+
 	/**
 	 * Combine the API array into the internal representation.
-	 * The input structure MUST be valid for this to work - two types of objects are allowed as 
+	 * The input structure MUST be valid for this to work - two types of objects are allowed as
 	 *   array entries:
 	 *     { node: '', source: '', func: '', type: '', removed: bool }
 	 *     { node: '', source: '', listeners: [ func: '', type: '', removed: bool, ... ] }
@@ -980,14 +1014,14 @@ VisualEvent.prototype = {
 	{
 		var i, j,
 			found, found2;
-		
+
 		for ( i=0 ; i<api.length ; i++ ) {
 			if ( typeof api[i].listeners != 'undefined' ) {
 				main.push( api[i] );
 			}
 			else {
 				found = -1;
-				
+
 				/* Want to combine single definitions into our single entry for each node array */
 				for ( j=0 ; j<main.length ; j++ ) {
 					if ( main[j].node == api[i].node ) {
@@ -995,7 +1029,7 @@ VisualEvent.prototype = {
 						break;
 					}
 				}
-				
+
 				if ( found == -1 ) {
 					main.push( {
 						"node": api[i].node,
@@ -1020,7 +1054,7 @@ VisualEvent.prototype = {
 							break;
 						}
 					}
-					
+
 					/* If not found - then add it in */
 					if ( found2 != -1 ) {
 						main[ found ].listeners.push( {
@@ -1032,11 +1066,11 @@ VisualEvent.prototype = {
 				}
 			}
 		}
-		
+
 		return main;
 	},
-	
-	
+
+
 	/**
 	 * Group the event types as per w3c groupings
 	 *  @param {string} type Event type
@@ -1055,27 +1089,27 @@ VisualEvent.prototype = {
 			case 'mouseup':
 			case 'scroll':
 				return 'mouse';
-			
+
 			case 'change':
 			case 'focus':
 			case 'blur':
 			case 'select':
 			case 'submit':
 				return 'html';
-				
+
 			case 'keydown':
 			case 'keypress':
 			case 'keyup':
 			case 'load':
 			case 'unload':
 				return 'ui';
-			
+
 			default:
 				return 'custom';
 		}
 	},
-	
-	
+
+
 	/**
 	 * Compute the background colour of the event indicator from the event types
 	 *  @param {array} events Events information
@@ -1088,34 +1122,34 @@ VisualEvent.prototype = {
 		var hasHtml = false;
 		var hasUi = false;
 		var group, i;
-		
+
 		for ( i=0 ; i<events.length ; i++ ) {
 			group = this._eventTypeGroup( events[i].type );
-			
+
 			switch ( group ) {
 				case 'mouse':
 					hasMouse = true;
 					break;
-				
+
 				case 'html':
 					hasHtml = true;
 					break;
-					
+
 				case 'ui':
 					/* We call 'custom' and 'unknown' types UI as well */
 					hasUi = true;
 					break;
-				
+
 				default:
 					hasUi = true;
 					break;
 			}
 		}
-		
+
 		/*
 		 * Since we have three event groups which can be in any combination - then we can group the
 		 * resultant colours via the colour wheel
-		 *        
+		 *
 		 *                        Red (UI)
 		 *                         +++++
 		 *                       ++     ++
diff --git a/js/parsers/jQuery.js b/js/parsers/jQuery.js
index 53f593f..d7dfd45 100644
--- a/js/parsers/jQuery.js
+++ b/js/parsers/jQuery.js
@@ -4,53 +4,56 @@
 // jQuery 1.5, 1.6
 VisualEvent.parsers.push( function () {
 	var version = jQuery.fn.jquery.substr(0,3)*1;
-	
+
 	if ( !jQuery || version < 1.5 || version >= 1.7 ) {
 		return [];
 	}
-	
+
 	var elements = [];
 	for ( j in jQuery.cache ) {
 		jQueryGeneric( elements, jQuery.cache[j] );
 	}
-	
+
 	return elements;
 } );
 
 // jQuery 1.4, 1.7
 VisualEvent.parsers.push( function () {
 	var version = jQuery.fn.jquery.substr(0,3)*1;
-	
+
 	if ( !jQuery || version < 1.4 ) {
 		return [];
 	}
-	
+
 	var elements = [];
 	jQueryGeneric( elements, jQuery.cache );
-	
+
 	return elements;
 } );
 
 
 function jQueryGeneric (elements, cache)
 {
-	for ( i in cache ) {
+	for ( var i in cache ) {
 		if ( typeof cache[i].events == 'object' ) {
 			var eventAttachedNode = cache[i].handle.elem;
 			var func;
-			
-			for ( type in cache[i].events ) {
+
+			for ( var type in cache[i].events ) {
 				/* Ignore live event object - live events are listed as normal events as well */
 				if ( type == 'live' ) {
 					continue;
 				}
-				
+
 				var oEvents = cache[i].events[type];
-				
-				for ( j in oEvents ) {
+
+				for ( var j in oEvents ) {
+					if ( j in oEvents.prototype ) {
+						continue;
+					}
 					var aNodes = [];
 					var sjQuery = "jQuery "+jQuery.fn.jquery;
-					
+
 					if ( typeof oEvents[j].selector != 'undefined' && oEvents[j].selector !== null ) {
 						aNodes = $(oEvents[j].selector, cache[i].handle.elem);
 						sjQuery += " (live event)";
@@ -58,13 +61,13 @@ function jQueryGeneric (elements, cache)
 					else {
 						aNodes.push( eventAttachedNode );
 					}
-					
+
 					for ( var k=0, kLen=aNodes.length ; k<kLen ; k++ ) {
 						elements.push( {
 							"node": aNodes[k],
 							"listeners": []
 						} );
-						
+
 						if ( typeof oEvents[j].origHandler != 'undefined' ) {
 							func = oEvents[j].origHandler.toString();
 						}
@@ -74,7 +77,7 @@ function jQueryGeneric (elements, cache)
 						else {
 							func = oEvents[j].toString();
 						}
-						
+
 						/* We use jQuery for the Visual Event events... don't really want to display them */
 						if ( oEvents[j] && oEvents[j].namespace != "VisualEvent" && func != "0" )
 						{
diff --git a/js/parsers/prototype1.7.js b/js/parsers/prototype1.7.js
new file mode 100644
index 0000000..04d2c41
--- /dev/null
+++ b/js/parsers/prototype1.7.js
@@ -0,0 +1,41 @@
+
+(function(window, document, $, VisualEvent) {
+
+  function dumpListeners(event) {
+    var listeners = [];
+
+    for (var eventType in event) {
+      var handlers = event[eventType];
+
+      for (var i = 0, len = handlers.length; i < len; i++) {
+        listeners.push({
+          "type": eventType,
+          "func": handlers[i].handler.toString(),
+          "removed": false,
+          "source": 'Prototype 1.7+'
+        });
+      }
+    }
+
+    return listeners;
+  }
+
+  VisualEvent.parsers.push(function() {
+    if (typeof Prototype == 'undefined') {
+      return [];
+    }
+
+    var elements = [], event;
+
+    for (var e in Event.cache) {
+      event = Event.cache[e];
+      elements.push({
+        "node": event.element,
+        "listeners": dumpListeners(event)
+      });
+    }
+
+    return elements;
+  });
+
+})(window, document, jQuery, VisualEvent);