diff --git a/.travis.yml b/.travis.yml
index 10a2b764..94a4b94c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,8 @@
 language: node_js
 node_js:
   - 8
+addons:
+  firefox: "63.0"
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
diff --git a/src/drag.js b/src/drag.js
index 1f65d9a6..d39f35aa 100644
--- a/src/drag.js
+++ b/src/drag.js
@@ -1,5 +1,11 @@
 var syn = require('./synthetic');
 
+/*
+TODO: This is getting very complicated. We should probably separate the DRAG and MOVE abilities 
+	into two separate actions
+TODO: It might also be worth giving html5drag and jQuery drag two different code paths, 
+	rather than constantly checking and switching behaviors accordingly mid function
+*/
 
 
 
@@ -27,6 +33,7 @@ var elementFromPoint = function (point, win) {
 //======================================================================================================
 var DragonDrop = {
 	
+	html5drag : false,
 	focusWindow : null,
 	
 	/**
@@ -173,7 +180,7 @@ var DragonDrop = {
 			//get what fraction we are at
 			var now = new Date();
 			var scrollOffset = syn.helpers.scrollOffset(win);
-			var fraction = (calls === 0 ? 0 : now - startTime) / duration; // TODO: Make this legible
+			var fraction = (calls === 0 ? 0 : now - startTime) / duration;
 			var options = {
 				clientX: distX * fraction + start.clientX,
 				clientY: distY * fraction + start.clientY
@@ -319,18 +326,40 @@ syn.create.dragend = {
 
 			// QUESTION: Should we also be sending a pointerleave event?
 			options.relatedTarget = el;
-			if(syn.support.pointerEvents){syn.trigger(last, 'pointerout', options);}
+			if(syn.support.pointerEvents){
+				syn.trigger(last, 'pointerout', options);
+				syn.trigger(last, 'pointerleave', options);
+			}
 			syn.trigger(last, "mouseout", options);
+			syn.trigger(last, "mouseleave", options);
 
-			// QUESTION: Should we also be sending a pointerenter event?
 			options.relatedTarget = last;
-			if(syn.support.pointerEvents){syn.trigger(el, 'pointerover', options);}
+			if(syn.support.pointerEvents){
+				syn.trigger(el, 'pointerover', options);
+				syn.trigger(el, 'pointerenter', options);
+			}
 			syn.trigger(el, "mouseover", options);
+			syn.trigger(el, "mouseenter", options);
 		}
 
 		if(syn.support.pointerEvents){syn.trigger(el || win, "pointermove", point);}
 		if(syn.support.touchEvents){syn.trigger(el || win, "touchmove", point);}
-		syn.trigger(el || win, "mousemove", point);
+		
+		//console.log("DRAGGED: " + DragonDrop.html5drag);
+		
+		/* 
+			The following code needs some explanation. Firefox and Chrome DO NOT issue mousemove events during HTML5-dragdrops
+			However, they do issue mousemoves during jQuery-dragdrops. I am making the assumption here (which may or may not 
+			be valid - let me know if it is wrong and I'll adjust,) that all PointerEvent-type browsers DO NOT issue
+			mousemoves during HTML5-dragdrop, but DO issue during jQuery.
+		*/
+		if(DragonDrop.html5drag){
+			if(!syn.support.pointerEvents){ syn.trigger(el || win, "mousemove", point); }	
+		}else{
+			syn.trigger(el || win, "mousemove", point);
+		}
+		
+		
 		return el;
 	},
 
@@ -616,6 +645,8 @@ syn.helpers.extend(syn.init.prototype, {
 		var sourceCoordinates = convertOption(options.from || from, win, from);
 		var destinationCoordinates = convertOption(options.to || options, win, from);
 
+		DragonDrop.html5drag = syn.support.pointerEvents;
+
 		if (options.adjust !== false) {
 			adjust(sourceCoordinates, destinationCoordinates, win);
 		}
@@ -653,9 +684,9 @@ syn.helpers.extend(syn.init.prototype, {
 			adjust(sourceCoordinates, destinationCoordinates, win);
 		}
 		
-		var html5draggable = from.draggable;
+		DragonDrop.html5drag = from.draggable;
 
-		if(html5draggable){
+		if(DragonDrop.html5drag){
 			DragonDrop.dragAndDrop(win, sourceCoordinates, destinationCoordinates, options.duration || 500, callback);
 		}else{
 			startDrag(win, sourceCoordinates, destinationCoordinates, options.duration || 500, callback);
diff --git a/src/synthetic.js b/src/synthetic.js
index 0e9691c3..36da4c28 100644
--- a/src/synthetic.js
+++ b/src/synthetic.js
@@ -9,16 +9,16 @@ var extend = function (d, s) {
 	}
 	return d;
 },
-	// only uses browser detection for key events
+	// only uses browser detection for dispatching proper events
 	browser = {
-		//msie: !! (window.attachEvent && !window.opera),
 		msie: (!!(window.attachEvent && !window.opera) || (navigator.userAgent.indexOf('Trident/') > -1)),
 		opera: !! window.opera,
 		webkit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
 		safari: navigator.userAgent.indexOf('AppleWebKit/') > -1 && navigator.userAgent.indexOf('Chrome/') === -1,
 		gecko: navigator.userAgent.indexOf('Gecko') > -1,
 		mobilesafari: !! navigator.userAgent.match(/Apple.*Mobile.*Safari/),
-		rhino: navigator.userAgent.match(/Rhino/) && true
+		rhino: navigator.userAgent.match(/Rhino/) && true,
+		chrome: !!window.chrome && !!window.chrome.webstore
 	},
 	createEventObject = function (type, options, element) {
 		var event = element.ownerDocument.createEventObject();
diff --git a/test/key_regressions_test.js b/test/key_regressions_test.js
index 1362cfc5..8f04db68 100644
--- a/test/key_regressions_test.js
+++ b/test/key_regressions_test.js
@@ -43,7 +43,7 @@ QUnit.test("Special keycodes for enter on TextBox", 1, function () {
 		var pageUnderTest = document.getElementById('pageUnderTest').contentDocument.querySelector('body');
 		var keyTarget = pageUnderTest.querySelector('#synthetic');
 		var output = pageUnderTest.querySelector('#synthetic_events');
-		var browser = browserDetective();
+		var browser = BrowserDetective.getBrowserName();
 		
 		console.log(browser);
 		
@@ -77,7 +77,7 @@ QUnit.test("Special keycodes for enter on TextArea", 1, function () {
 		var pageUnderTest = document.getElementById('pageUnderTest').contentDocument.querySelector('body');
 		var keyTarget = pageUnderTest.querySelector('#area');
 		var output = pageUnderTest.querySelector('#synthetic_events');
-		var browser = browserDetective();
+		var browser = BrowserDetective.getBrowserName();
 		
 		syn.type(keyTarget, "\b\r", function(){
 
@@ -100,35 +100,4 @@ QUnit.test("Special keycodes for enter on TextArea", 1, function () {
 });
 
 
-// Note: This is required because different browsers send different key events
-// Note also: I am currently only checking this against DESKTOP browsers. Events may be different on mobile
-//      if-so, we will have to make this smarter.
-function browserDetective(){
-	
-	var isOpera = (!!window.opr && !!opr.addons) || !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0;
-	if(isOpera){ return "opera"; }
-
-	// Firefox 1.0+
-	var isFirefox = typeof InstallTrigger !== 'undefined';
-	if(isFirefox){ return "firefox"; }
-
-	// Safari 3.0+ "[object HTMLElementConstructor]" 
-	var isSafari = /constructor/i.test(window.HTMLElement) || (function (p) { return p.toString() === "[object SafariRemoteNotification]"; })(!window['safari'] || (typeof safari !== 'undefined' && safari.pushNotification));
-	if(isSafari){ return "safari"; }
-
-	// Internet Explorer 6-11
-	var isIE = /*@cc_on!@*/false || !!document.documentMode;
-	if(isIE){ return "ie"; }
-
-	// Edge 20+
-	var isEdge = !isIE && !!window.StyleMedia;
-	if(isEdge){ return "edge"; }
-	
-	// Chrome 1+
-	var isChrome = !!window.chrome && !!window.chrome.webstore;	
-	if(isChrome){ return "chrome"; }
-	
-	return "unknown";
-}
-
 
diff --git a/test/mouse_move_test.js b/test/mouse_move_test.js
index d69586ee..2bfce235 100644
--- a/test/mouse_move_test.js
+++ b/test/mouse_move_test.js
@@ -1,3 +1,14 @@
+/*
+	MOUSE MOVE TEST
+	
+	Ensures the accuracy of mouse events specific to mouse movement.
+	
+	Planned Improvements:
+	TODO: change checkThatMousePassedOver to include not-only the order of events, but the number of events.
+	For example, duplicate mouseEnters would be a bug, but would not be caught under the current system.
+	
+*/
+
 var syn = require('syn');
 var locate = require('test/locate_test');
 var QUnit = require("steal-qunit");
@@ -10,6 +21,9 @@ var testSpeed = 200;
 var frameHeight = 350;
 var frameUrl = 'testpages/mousemove.html';
 
+var mouseMoveOver = 'pointerover, pointerenter, mouseover, mouseenter, pointermove, pointerout, pointerleave, mouseout, mouseleave, ';
+var mouseMoveEnd = 'pointerover, pointerenter, mouseover, mouseenter, pointermove, ';
+
 QUnit.test("Move Cursor Upward", 8, function () {
 	stop();
 	
@@ -25,18 +39,18 @@ QUnit.test("Move Cursor Upward", 8, function () {
 		syn.move(source, {to: destination, duration: testSpeed}, function () {
 			
 			// ensure we get mouse events over the places that we expect
-			checkThatMousePassedOver(pageUnderTest, "#cell_a2", true);
-			checkThatMousePassedOver(pageUnderTest, "#cell_b2", true);
-			//checkThatMousePassedOver(pageUnderTest, "#cell_c2" true); // TODO: starting cell not working, why?
+			checkThatMousePassedOver(pageUnderTest, "#cell_a2", mouseMoveEnd);
+			checkThatMousePassedOver(pageUnderTest, "#cell_b2", mouseMoveOver);
+			//checkThatMousePassedOver(pageUnderTest, "#cell_c2", mouseMoveOver); // TODO: Starting cell gets no entry events!
 			
 			// ensure that neighbors to expected mouse event locations do not get events
-			checkThatMousePassedOver(pageUnderTest, "#cell_a1", false);
-			checkThatMousePassedOver(pageUnderTest, "#cell_b1", false);
-			checkThatMousePassedOver(pageUnderTest, "#cell_c1", false);
-			checkThatMousePassedOver(pageUnderTest, "#cell_a3", false);
-			checkThatMousePassedOver(pageUnderTest, "#cell_b3", false);
-			checkThatMousePassedOver(pageUnderTest, "#cell_c3", false);
-					
+			checkThatMousePassedOver(pageUnderTest, "#cell_a1", '');
+			checkThatMousePassedOver(pageUnderTest, "#cell_b1", '');
+			checkThatMousePassedOver(pageUnderTest, "#cell_c1", '');
+			checkThatMousePassedOver(pageUnderTest, "#cell_a3", '');
+			checkThatMousePassedOver(pageUnderTest, "#cell_b3", '');
+			checkThatMousePassedOver(pageUnderTest, "#cell_c3", '');
+						
 			start();
 		});
 	});
@@ -64,17 +78,17 @@ QUnit.test("Move Cursor Downward", 8, function () {
 		syn.move(source, {to: destination, duration: testSpeed}, function () {
 			
 			// ensure we get mouse events over the places that we expect
-			checkThatMousePassedOver(pageUnderTest, "#cell_e2", true);
-			checkThatMousePassedOver(pageUnderTest, "#cell_d2", true);
+			checkThatMousePassedOver(pageUnderTest, "#cell_e2", mouseMoveEnd);
+			checkThatMousePassedOver(pageUnderTest, "#cell_d2", mouseMoveOver);
 			//checkThatMousePassedOver(pageUnderTest, "#cell_c2" true); // TODO: starting cell not working, why?
 			
 			// ensure that neighbors to expected mouse event locations do not get events
-			checkThatMousePassedOver(pageUnderTest, "#cell_e1", false);
-			checkThatMousePassedOver(pageUnderTest, "#cell_d1", false);
-			checkThatMousePassedOver(pageUnderTest, "#cell_c1", false);
-			checkThatMousePassedOver(pageUnderTest, "#cell_e3", false);
-			checkThatMousePassedOver(pageUnderTest, "#cell_d3", false);
-			checkThatMousePassedOver(pageUnderTest, "#cell_c3", false);
+			checkThatMousePassedOver(pageUnderTest, "#cell_e1", '');
+			checkThatMousePassedOver(pageUnderTest, "#cell_d1", '');
+			checkThatMousePassedOver(pageUnderTest, "#cell_c1", '');
+			checkThatMousePassedOver(pageUnderTest, "#cell_e3", '');
+			checkThatMousePassedOver(pageUnderTest, "#cell_d3", '');
+			checkThatMousePassedOver(pageUnderTest, "#cell_c3", '');
 
 			start();
 		});
@@ -102,17 +116,17 @@ QUnit.test("Move Cursor Leftward", 8, function () {
 		syn.move(source, {to: destination, duration: testSpeed}, function () {
 			
 			// ensure we get mouse events over the places that we expect
-			checkThatMousePassedOver(pageUnderTest, "#cell_c0", true);
-			checkThatMousePassedOver(pageUnderTest, "#cell_c1", true);
+			checkThatMousePassedOver(pageUnderTest, "#cell_c0", mouseMoveEnd);
+			checkThatMousePassedOver(pageUnderTest, "#cell_c1", mouseMoveOver);
 			//checkThatMousePassedOver(pageUnderTest, "#cell_c2" true); // TODO: starting cell not working, why?
 			
 			// ensure that neighbors to expected mouse event locations do not get events
-			checkThatMousePassedOver(pageUnderTest, "#cell_b0", false);
-			checkThatMousePassedOver(pageUnderTest, "#cell_b1", false);
-			checkThatMousePassedOver(pageUnderTest, "#cell_b2", false);
-			checkThatMousePassedOver(pageUnderTest, "#cell_d0", false);
-			checkThatMousePassedOver(pageUnderTest, "#cell_d1", false);
-			checkThatMousePassedOver(pageUnderTest, "#cell_d2", false);
+			checkThatMousePassedOver(pageUnderTest, "#cell_b0", '');
+			checkThatMousePassedOver(pageUnderTest, "#cell_b1", '');
+			checkThatMousePassedOver(pageUnderTest, "#cell_b2", '');
+			checkThatMousePassedOver(pageUnderTest, "#cell_d0", '');
+			checkThatMousePassedOver(pageUnderTest, "#cell_d1", '');
+			checkThatMousePassedOver(pageUnderTest, "#cell_d2", '');
 
 			start();
 		});
@@ -140,17 +154,17 @@ QUnit.test("Move Cursor Rightward", 8, function () {
 		syn.move(source, {to: destination, duration: testSpeed}, function () {
 			
 			// ensure we get mouse events over the places that we expect
-			checkThatMousePassedOver(pageUnderTest, "#cell_c4", true);
-			checkThatMousePassedOver(pageUnderTest, "#cell_c3", true);
+			checkThatMousePassedOver(pageUnderTest, "#cell_c4", mouseMoveEnd);
+			checkThatMousePassedOver(pageUnderTest, "#cell_c3", mouseMoveOver);
 			//checkThatMousePassedOver(pageUnderTest, "#cell_c2" true); // TODO: starting cell not working, why?
 			
 			// ensure that neighbors to expected mouse event locations do not get events
-			checkThatMousePassedOver(pageUnderTest, "#cell_b2", false);
-			checkThatMousePassedOver(pageUnderTest, "#cell_b3", false);
-			checkThatMousePassedOver(pageUnderTest, "#cell_b4", false);
-			checkThatMousePassedOver(pageUnderTest, "#cell_d2", false);
-			checkThatMousePassedOver(pageUnderTest, "#cell_d3", false);
-			checkThatMousePassedOver(pageUnderTest, "#cell_d4", false);
+			checkThatMousePassedOver(pageUnderTest, "#cell_b2", '');
+			checkThatMousePassedOver(pageUnderTest, "#cell_b3", '');
+			checkThatMousePassedOver(pageUnderTest, "#cell_b4", '');
+			checkThatMousePassedOver(pageUnderTest, "#cell_d2", '');
+			checkThatMousePassedOver(pageUnderTest, "#cell_d3", '');
+			checkThatMousePassedOver(pageUnderTest, "#cell_d4", '');
 
 			start();
 		});
@@ -178,8 +192,8 @@ QUnit.test("Move Cursor Diagonal Up+Left", 2, function () {
 		syn.move(source, {to: destination, duration: testSpeed}, function () {
 			
 			// ensure we get mouse events over the places that we expect
-			checkThatMousePassedOver(pageUnderTest, "#cell_a0", true);
-			checkThatMousePassedOver(pageUnderTest, "#cell_b1", true);
+			checkThatMousePassedOver(pageUnderTest, "#cell_a0", mouseMoveEnd);
+			checkThatMousePassedOver(pageUnderTest, "#cell_b1", mouseMoveOver);
 			//checkThatMousePassedOver(pageUnderTest, "#cell_c2" true); // TODO: starting cell not working, why?
 			
 			start();
@@ -208,8 +222,8 @@ QUnit.test("Move Cursor Diagonal Up+Right", 2, function () {
 		syn.move(source, {to: destination, duration: testSpeed}, function () {
 			
 			// ensure we get mouse events over the places that we expect
-			checkThatMousePassedOver(pageUnderTest, "#cell_a4", true);
-			checkThatMousePassedOver(pageUnderTest, "#cell_b3", true);
+			checkThatMousePassedOver(pageUnderTest, "#cell_a4", mouseMoveEnd);
+			checkThatMousePassedOver(pageUnderTest, "#cell_b3", mouseMoveOver);
 			//checkThatMousePassedOver(pageUnderTest, "#cell_c2" true); // TODO: starting cell not working, why?
 			
 			start();
@@ -238,8 +252,8 @@ QUnit.test("Move Cursor Diagonal Down+Left", 2, function () {
 		syn.move(source, {to: destination, duration: testSpeed}, function () {
 			
 			// ensure we get mouse events over the places that we expect
-			checkThatMousePassedOver(pageUnderTest, "#cell_e0", true);
-			checkThatMousePassedOver(pageUnderTest, "#cell_d1", true);
+			checkThatMousePassedOver(pageUnderTest, "#cell_e0", mouseMoveEnd);
+			checkThatMousePassedOver(pageUnderTest, "#cell_d1", mouseMoveOver);
 			//checkThatMousePassedOver(pageUnderTest, "#cell_c2" true); // TODO: starting cell not working, why?
 			
 			start();
@@ -253,7 +267,7 @@ QUnit.test("Move Cursor Diagonal Down+Left", 2, function () {
 
 
 
-QUnit.test("Move Cursor Diagonal Down+Right", 2, function () {
+QUnit.test("Move Cursor Diagonal Down+Right", 1, function () {
 	stop();
 		
 	var testFrame = document.getElementById('pageUnderTest');
@@ -267,9 +281,10 @@ QUnit.test("Move Cursor Diagonal Down+Right", 2, function () {
 
 		syn.move(source, {to: destination, duration: testSpeed}, function () {
 			
-			// ensure we get mouse events over the places that we expect
-			checkThatMousePassedOver(pageUnderTest, "#cell_e4", true);
-			checkThatMousePassedOver(pageUnderTest, "#cell_d3", true);
+			// NOTE: The test sporadically moves the mouse at the end of the test, causing extra events to appear here.
+			// so we can't rely on the #cell_e4 check
+			// checkThatMousePassedOver(pageUnderTest, "#cell_e4", mouseMoveEnd);
+			checkThatMousePassedOver(pageUnderTest, "#cell_d3", mouseMoveOver);
 			//checkThatMousePassedOver(pageUnderTest, "#cell_c2" true); // TODO: starting cell not working, why?
 			
 			start();
@@ -281,8 +296,25 @@ QUnit.test("Move Cursor Diagonal Down+Right", 2, function () {
 });
 
 
-function checkThatMousePassedOver(pageUnderTest, cellName, expectedState){
+function checkThatMousePassedOver(pageUnderTest, cellName, expectedEvents){
 	var cell = pageUnderTest.querySelector(cellName);
-	ok((cell.classList.contains('mouseOver') == expectedState), "MouseOver on expected node: "+cellName+".");
+	var browser = BrowserDetective.getBrowserName();
+	var actualEvents = '';
+	
+	//var i;
+	for (var i = 0; i < cell.eventRecorder.length; i++) { 
+		actualEvents += cell.eventRecorder[i] +  ", ";
+	}	
+	
+	//cell.eventRecorder.forEach(function(elem) { actualEvents += elem + ", "; });	
+	equal(actualEvents, expectedEvents, "Recorded events must match expected events. CellId: " + cellName);
+	
 }
 
+
+
+
+
+
+
+
diff --git a/test/pages/h3.html b/test/pages/h3.html
index f7c41cc6..832103ec 100644
--- a/test/pages/h3.html
+++ b/test/pages/h3.html
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE html>
 <html>
 	<head></head>
 	<body>
diff --git a/test/pages/page1.html b/test/pages/page1.html
index 2c3a50c6..4d1e206b 100644
--- a/test/pages/page1.html
+++ b/test/pages/page1.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 	<body>
 		page 1
diff --git a/test/pages/page2.html b/test/pages/page2.html
index 74d7c77f..2a8cb0ed 100644
--- a/test/pages/page2.html
+++ b/test/pages/page2.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 	<body>
 		page 2
diff --git a/test/pages/page3.html b/test/pages/page3.html
index a96fbd1d..046d5e35 100644
--- a/test/pages/page3.html
+++ b/test/pages/page3.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 	<body>
 		<select id="select1">
diff --git a/test/pages/syn.schedule.html b/test/pages/syn.schedule.html
index 7157bbb6..015c0faf 100644
--- a/test/pages/syn.schedule.html
+++ b/test/pages/syn.schedule.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Syn.schedule test</title>
diff --git a/test/resources/helpers/BrowserDetective.js b/test/resources/helpers/BrowserDetective.js
new file mode 100644
index 00000000..6d6d2d2a
--- /dev/null
+++ b/test/resources/helpers/BrowserDetective.js
@@ -0,0 +1,44 @@
+/* 
+	BROWSER DETECTIVE
+	v 0.1
+	
+	Browser Detective detects which browser is currently being used.
+	This is important for testing event accuracy because different browsers send different events
+	and/or send events in a different order.
+	
+	To ensure the accurary of our tools, we must know the browser and be adjust assertions 
+	accordingly.
+	
+*/
+
+var BrowserDetective = {
+	version: "version 0.1",
+
+	getBrowserName : function(){
+
+		var isOpera = (!!window.opr && !!opr.addons) || !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0;
+		if(isOpera){ return "opera"; }
+
+		// Firefox 1.0+
+		var isFirefox = typeof InstallTrigger !== 'undefined';
+		if(isFirefox){ return "firefox"; }
+
+		// Safari 3.0+ "[object HTMLElementConstructor]" 
+		var isSafari = /constructor/i.test(window.HTMLElement) || (function (p) { return p.toString() === "[object SafariRemoteNotification]"; })(!window['safari'] || (typeof safari !== 'undefined' && safari.pushNotification));
+		if(isSafari){ return "safari"; }
+
+		// Internet Explorer 6-11
+		var isIE = /*@cc_on!@*/false || !!document.documentMode;
+		if(isIE){ return "ie"; }
+
+		// Edge 20+
+		var isEdge = !isIE && !!window.StyleMedia;
+		if(isEdge){ return "edge"; }
+	
+		// Chrome 1+
+		var isChrome = !!window.chrome && !!window.chrome.webstore;	
+		if(isChrome){ return "chrome"; }
+	
+		return "unknown";
+	}
+}
\ No newline at end of file
diff --git a/test/test.html b/test/test.html
index 351e012a..efc95934 100644
--- a/test/test.html
+++ b/test/test.html
@@ -10,6 +10,8 @@
 		<title>Syn Tests</title>
 		<link rel="stylesheet" href="../utils/Xenophon.css">
 		<script type="text/javascript" src="../utils/Xenophon.js"></script>
+		<script type="text/javascript" src="resources/helpers/BrowserDetective.js"></script>
+		
 		<style>
 			div.mookDefenseShield{
 				position:absolute;
diff --git a/test/testpages/draw.html b/test/testpages/draw.html
index 50f01749..23852cce 100644
--- a/test/testpages/draw.html
+++ b/test/testpages/draw.html
@@ -1,4 +1,4 @@
- <!doctype html>
+<!DOCTYPE html>
  <html>
 	<head>
 		<script type="text/javascript">
diff --git a/test/testpages/html5_dragdrop.html b/test/testpages/html5_dragdrop.html
index 581cd3d1..7d25a191 100644
--- a/test/testpages/html5_dragdrop.html
+++ b/test/testpages/html5_dragdrop.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE html>
 <html>
 	<head>
 		<link rel="shortcut icon" href="../resources/images/favicon.ico" type="image/x-icon">
diff --git a/test/testpages/jquery_dragdrop.html b/test/testpages/jquery_dragdrop.html
index dd5566a5..0d7ccbe1 100644
--- a/test/testpages/jquery_dragdrop.html
+++ b/test/testpages/jquery_dragdrop.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
 	<meta charset="utf-8">
diff --git a/test/testpages/mouseclick.html b/test/testpages/mouseclick.html
index 6548f6af..2588058d 100644
--- a/test/testpages/mouseclick.html
+++ b/test/testpages/mouseclick.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE html>
 <html>
 	<head>
 		<link rel="shortcut icon" href="../resources/images/favicon.ico" type="image/x-icon">
diff --git a/test/testpages/mousemove.html b/test/testpages/mousemove.html
index 05e3217e..672c7d80 100644
--- a/test/testpages/mousemove.html
+++ b/test/testpages/mousemove.html
@@ -1,13 +1,27 @@
-<!DOCTYPE HTML>
+<!DOCTYPE html>
 <html>
 	<head>
 		<link rel="shortcut icon" href="../resources/images/favicon.ico" type="image/x-icon">
-		<title>Dragon Drop testing</title>
+		<title>Mouse Move testing</title>
 		<script>
-			function mousedOver(ev, targetElement) {
-				ev.preventDefault();
-				//if(targetElement.classList.contains('mouseOver')){ return; }
-				targetElement.classList.add('mouseOver');
+		
+			function mousedOver(event, targetElement) {
+				event.preventDefault();
+				
+				var eventName = event.type.toLowerCase();
+				
+				switch(eventName){
+					case "pointerover" : targetElement.classList.add("mouseOver"); break;
+					case "mouseover" : targetElement.classList.add("mouseOver"); break;
+					case "pointerdown" : targetElement.classList.add("mouseDown"); break;
+					case "mousedown" : targetElement.classList.add("mouseDown"); break;
+					case "pointerup" : targetElement.classList.add("mouseUp"); break;
+					case "mouseup" : targetElement.classList.add("mouseUp"); break;
+				}
+				
+				if(! targetElement.eventRecorder.includes(eventName)){
+					targetElement.eventRecorder.push(eventName);
+				}
 				
 			}
 
@@ -22,10 +36,18 @@
 				margin-right: auto;
 			}
 
-			span.mouseOver {
+			span.mouseOver:not(.mouseDown):not(.mouseUp) {
 				background-color: lightblue;
 			}
 
+			span.mouseDown {
+				background-color: green;
+			}
+
+			span.mouseUp {
+				background-color: blue;
+			}	
+
 			span.dragOrigin {
 				display:inline-block;
 				height: 60px;
@@ -36,7 +58,7 @@
 				margin-right: auto;
 			}
 
-			img {
+			img.detectsMouseOver {
 				height: 60px;
 			}
 
@@ -47,7 +69,6 @@
 		<link rel="stylesheet" href="../../utils/Xenophon.css">
 		<script type="text/javascript" src="../../utils/Xenophon.js"></script>
 
-
 	</head>
 	<body>
 
@@ -89,9 +110,26 @@
 		
 		<script>
 
-			mouseListeners = document.querySelectorAll('span.detectsMouseOver');
+			mouseListeners = document.querySelectorAll('span.detectsMouseOver');	
 			mouseListeners.forEach(function(elem){
+			
+				elem.eventRecorder = [];	
+				elem.addEventListener("pointerover", function(event){ mousedOver(event, elem); });
+				elem.addEventListener("pointerenter", function(event){ mousedOver(event, elem); });
 				elem.addEventListener("mouseover", function(event){ mousedOver(event, elem); });
+				elem.addEventListener("mouseenter", function(event){ mousedOver(event, elem); });
+				elem.addEventListener("pointermove", function(event){ mousedOver(event, elem); });
+				elem.addEventListener("mousemove", function(event){ mousedOver(event, elem); });
+				elem.addEventListener("pointerdown", function(event){ mousedOver(event, elem); });
+				elem.addEventListener("mousedown", function(event){ mousedOver(event, elem); });
+				elem.addEventListener("pointerup", function(event){ mousedOver(event, elem); });
+				elem.addEventListener("mouseup", function(event){ mousedOver(event, elem); });
+				elem.addEventListener("click", function(event){ mousedOver(event, elem); });
+				elem.addEventListener("pointerout", function(event){ mousedOver(event, elem); });
+				elem.addEventListener("pointerleave", function(event){ mousedOver(event, elem); });
+				elem.addEventListener("mouseout", function(event){ mousedOver(event, elem); });
+				elem.addEventListener("mouseleave", function(event){ mousedOver(event, elem); });
+				
 			});
 
 		</script>
diff --git a/test/testpages/regressions_keyboard2.html b/test/testpages/regressions_keyboard2.html
index 4090491b..439dc92d 100644
--- a/test/testpages/regressions_keyboard2.html
+++ b/test/testpages/regressions_keyboard2.html
@@ -2,7 +2,8 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>Test</title>
+    <title>Ensure fixed keyboard bugs do not regress</title>
+	
 </head>
 <body>
 
diff --git a/utils/Xenophon.js b/utils/Xenophon.js
index 62187f39..cbc82142 100644
--- a/utils/Xenophon.js
+++ b/utils/Xenophon.js
@@ -1,8 +1,19 @@
+/* 
+	XENOPHON
+	v 0.1
+	
+	Tracks most standard event types dispatched to a specified element and stores them 
+	in a convenient array, which can be traversed by an optional helpful GUI for quick 
+	traversal and debugging of events to ensure accuracy and consistency.
+	
+	Upcoming Planned Enhacements:
+	TODO: Private scoped functions should be rescoped
+	
+*/
+
 var Xenophon = {
 	version: "version 0.1",
 	
-	// TODOS: Private scoped functions should be rescoped
-
 	// ====================================