diff --git a/session.js b/session.js
index 49e63f9..4b4d18a 100644
--- a/session.js
+++ b/session.js
@@ -1,3 +1,4 @@
+/*jshint quotmark:false,curly:false,maxlen:340,maxdepth:4*/
 /**
  * session.js 0.4.1
  * (c) 2012 Iain, CodeJoust
@@ -79,7 +80,7 @@ var session_fetch = (function(win, doc, nav){
       var start = win.session.start;
     }
     // Set up checking, if all modules are ready
-    var asynchs = 0, module, result,
+    var asynchs = 0, module,
     check_asynch = function(deinc){
       if (deinc){ asynchs--; }
       if (asynchs === 0){
@@ -154,12 +155,15 @@ var session_fetch = (function(win, doc, nav){
       browser: [
         { string: nav.userAgent, subString: "Edge", identity: "Edge"},
         { string: nav.userAgent, subString: "Chrome", identity: "Chrome" },
+        { string: nav.userAgent, subString: "CriOS", identity: "Chrome", versionSearch: "CriOS" },
         { string: nav.userAgent, subString: "OmniWeb", versionSearch: "OmniWeb/", identity: "OmniWeb" },
+        { string: nav.userAgent, subString: "PhantomJS", identity: "PhantomJS" },
         { string: nav.vendor, subString: "Apple", identity: "Safari", versionSearch: "Version" },
         { prop:   win.opera, identity: "Opera", versionSearch: "Version" },
         { string: nav.vendor, subString: "iCab",identity: "iCab" },
         { string: nav.vendor, subString: "KDE", identity: "Konqueror" },
         { string: nav.userAgent, subString: "Firefox", identity: "Firefox" },
+        { string: nav.userAgent, subString: "Fluid", identity: "Fluid", versionSearch: "FluidApp Version" },
         { string: nav.vendor, subString: "Camino", identity: "Camino" },
         { string: nav.userAgent, subString: "Netscape", identity: "Netscape" },
         { string: nav.userAgent, subString: "MSIE", identity: "Explorer", versionSearch: "MSIE" },
@@ -237,13 +241,13 @@ var session_fetch = (function(win, doc, nav){
         var found = true;
         for (var i = 0; i < versions.length; i++){
           try {
-            var obj = new ActiveXObject("ShockwaveFlash.ShockwaveFlash" + versions[i])
-              , found = !0;
+            new ActiveXObject("ShockwaveFlash.ShockwaveFlash" + versions[i]);
+            found = !0;
           } catch (e){ /* nil */ }
           if (found) return true;
         }
         return false;
-      }
+      };
       return {
         flash:       check_plugin("flash") || check_activex_flash(['.7','.6','']),
         silverlight: check_plugin("silverlight"),
@@ -269,7 +273,7 @@ var session_fetch = (function(win, doc, nav){
           { name: "Ask", host: "ask.com", query: "q" },
           { name: "Baidu", host: "baidu.com", query: "wd" }
         ], length = search_engines.length,
-           engine, match, i = 0,
+           engine, i = 0,
            fallbacks = 'q query term p wd query text'.split(' ');
         for (i = 0; i < length; i++){
           engine = search_engines[i];
@@ -335,18 +339,18 @@ var session_fetch = (function(win, doc, nav){
         }};
     },
     architecture: function(){
-      var arch = n.userAgent.match(/x86_64|Win64|WOW64|x86-64|x64\;|AMD64|amd64/) ||
-                (n.cpuClass === 'x64') ? 'x64' : 'x86';
+      var arch = nav.userAgent.match(/x86_64|Win64|WOW64|x86-64|x64\;|AMD64|amd64/) ||
+                (nav.cpuClass === 'x64') ? 'x64' : 'x86';
       return {
         arch: arch,
         is_x64: arch == 'x64',
         is_x86: arch == 'x68'
-      }
+      };
     },
     ipinfodb_location: function(api_key){
       return function (callback){
         var location_cookie = util.get_obj(options.location_cookie);
-        if (!location_cookie && location_cookie.source === 'ipinfodb'){ 
+        if (!location_cookie && location_cookie.source === 'ipinfodb'){
         win.ipinfocb = function(data){
           if (data.statusCode === "OK"){
             data.source = "ipinfodb";
@@ -361,7 +365,7 @@ var session_fetch = (function(win, doc, nav){
           }};
         util.embed_script("http://api.ipinfodb.com/v3/ip-city/?key=" + api_key + "&format=json&callback=ipinfocb");
         } else { callback(location_cookie); }
-      }}
+      };}
   };
 
   // Utilities
@@ -385,7 +389,7 @@ var session_fetch = (function(win, doc, nav){
         protocol: a.protocol,
         port:     a.port === '' ? 80 : a.port,
         search:   a.search,
-        query:    query }
+        query:    query };
     },
     set_cookie: function(cname, value, expires, options){ // from jquery.cookie.js
       if (!cname){ return null; }
diff --git a/session.min.js b/session.min.js
index 85b992c..02fd4c5 100644
--- a/session.min.js
+++ b/session.min.js
@@ -1 +1 @@
-var session_fetch=function(win,doc,nav){"use strict";var API_VERSION=.4;var options={use_html5_location:false,ipinfodb_key:false,gapi_location:true,location_cookie:"location",location_cookie_timeout:5,session_timeout:32,session_cookie:"first_session",get_object:null,set_object:null};var SessionRunner=function(){win.session=win.session||{};win.session.contains=function(other_str){if(typeof other_str==="string"){return this.indexOf(other_str)!==-1}for(var i=0;i<other_str.length;i++){if(this.indexOf(other_str[i])!==-1){return true}}return false};if(win.session&&win.session.options){for(var option in win.session.options){options[option]=win.session.options[option]}}var unloaded_modules={api_version:API_VERSION,locale:modules.locale(),current_session:modules.session(),original_session:modules.session(options.session_cookie,options.session_timeout*24*60*60*1e3),browser:modules.browser(),plugins:modules.plugins(),time:modules.time(),device:modules.device()};if(options.use_html5_location){unloaded_modules.location=modules.html5_location()}else if(options.ipinfodb_key){unloaded_modules.location=modules.ipinfodb_location(options.ipinfodb_key)}else if(options.gapi_location){unloaded_modules.location=modules.gapi_location()}if(win.session&&win.session.start){var start=win.session.start}var asynchs=0,module,result,check_asynch=function(deinc){if(deinc){asynchs--}if(asynchs===0){if(start){start(win.session)}}};win.session={};for(var name in unloaded_modules){module=unloaded_modules[name];if(typeof module==="function"){try{module(function(data){win.session[name]=data;check_asynch(true)});asynchs++}catch(err){if(win.console&&typeof console.log==="function"){console.log(err);check_asynch(true)}}}else{win.session[name]=module}}check_asynch()};var browser={detect:function(){var ret={browser:this.search(this.data.browser),version:this.search(nav.userAgent)||this.search(nav.appVersion),os:this.search(this.data.os)};if(ret.os=="Linux"){var distros=["CentOS","Debian","Fedora","Gentoo","Mandriva","Mageia","Red Hat","Slackware","SUSE","Turbolinux","Ubuntu"];for(var i=0;i<distros.length;i++){if(nav.useragent.toLowerCase().match(distros[i].toLowerCase())){ret.distro=distros[i];break}}}return ret},search:function(data){if(typeof data==="object"){for(var i=0;i<data.length;i++){var dataString=data[i].string,dataProp=data[i].prop;this.version_string=data[i].versionSearch||data[i].identity;if(dataString){if(dataString.indexOf(data[i].subString)!=-1){return data[i].identity}}else if(dataProp){return data[i].identity}}}else{var index=data.indexOf(this.version_string);if(index==-1)return;return parseFloat(data.substr(index+this.version_string.length+1))}},data:{browser:[{string:nav.userAgent,subString:"Chrome",identity:"Chrome"},{string:nav.userAgent,subString:"OmniWeb",versionSearch:"OmniWeb/",identity:"OmniWeb"},{string:nav.vendor,subString:"Apple",identity:"Safari",versionSearch:"Version"},{prop:win.opera,identity:"Opera",versionSearch:"Version"},{string:nav.vendor,subString:"iCab",identity:"iCab"},{string:nav.vendor,subString:"KDE",identity:"Konqueror"},{string:nav.userAgent,subString:"Firefox",identity:"Firefox"},{string:nav.vendor,subString:"Camino",identity:"Camino"},{string:nav.userAgent,subString:"Netscape",identity:"Netscape"},{string:nav.userAgent,subString:"MSIE",identity:"Explorer",versionSearch:"MSIE"},{string:nav.userAgent,subString:"Gecko",identity:"Mozilla",versionSearch:"rv"},{string:nav.userAgent,subString:"Mozilla",identity:"Netscape",versionSearch:"Mozilla"}],os:[{string:nav.platform,subString:"Win",identity:"Windows"},{string:nav.platform,subString:"Mac",identity:"Mac"},{string:nav.userAgent,subString:"iPhone",identity:"iPhone/iPod"},{string:nav.userAgent,subString:"iPad",identity:"iPad"},{string:nav.userAgent,subString:"Android",identity:"Android"},{string:nav.platform,subString:"Linux",identity:"Linux"}]}};var modules={browser:function(){return browser.detect()},time:function(){var d1=new Date,d2=new Date;d1.setMonth(0);d1.setDate(1);d2.setMonth(6);d2.setDate(1);return{tz_offset:-(new Date).getTimezoneOffset()/60,observes_dst:d1.getTimezoneOffset()!==d2.getTimezoneOffset()}},locale:function(){var lang=(nav.language||nav.browserLanguage||nav.systemLanguage||nav.userLanguage||"").split("-");if(lang.length==2){return{country:lang[1].toLowerCase(),lang:lang[0].toLowerCase()}}else if(lang){return{lang:lang[0].toLowerCase(),country:null}}else{return{lang:null,country:null}}},device:function(){var device={screen:{width:win.screen.width,height:win.screen.height}};device.viewport={width:win.innerWidth||doc.documentElement.clientWidth||doc.body.clientWidth,height:win.innerHeight||doc.documentElement.clientHeight||doc.body.clientHeight};device.is_tablet=!!nav.userAgent.match(/(iPad|SCH-I800|xoom|kindle)/i);device.is_phone=!device.is_tablet&&!!nav.userAgent.match(/(iPhone|iPod|blackberry|android 0.5|htc|lg|midp|mmp|mobile|nokia|opera mini|palm|pocket|psp|sgh|smartphone|symbian|treo mini|Playstation Portable|SonyEricsson|Samsung|MobileExplorer|PalmSource|Benq|Windows Phone|Windows Mobile|IEMobile|Windows CE|Nintendo Wii)/i);device.is_mobile=device.is_tablet||device.is_phone;return device},plugins:function(){var check_plugin=function(name){if(nav.plugins){var plugin,i=0,length=nav.plugins.length;for(;i<length;i++){plugin=nav.plugins[i];if(plugin&&plugin.name&&plugin.name.toLowerCase().indexOf(name)!==-1){return true}}return false}return false};var check_activex_flash=function(versions){var found=true;for(var i=0;i<versions.length;i++){try{var obj=new ActiveXObject("ShockwaveFlash.ShockwaveFlash"+versions[i]),found=!0}catch(e){}if(found)return true}return false};return{flash:check_plugin("flash")||check_activex_flash([".7",".6",""]),silverlight:check_plugin("silverlight"),java:check_plugin("java"),quicktime:check_plugin("quicktime")}},session:function(cookie,expires){var session=util.get_obj(cookie);if(session==null){session={visits:1,start:(new Date).getTime(),last_visit:(new Date).getTime(),url:win.location.href,path:win.location.pathname,referrer:doc.referrer,referrer_info:util.parse_url(doc.referrer),search:{engine:null,query:null}};var search_engines=[{name:"Google",host:"google",query:"q"},{name:"Bing",host:"bing.com",query:"q"},{name:"Yahoo",host:"search.yahoo",query:"p"},{name:"AOL",host:"search.aol",query:"q"},{name:"Ask",host:"ask.com",query:"q"},{name:"Baidu",host:"baidu.com",query:"wd"}],length=search_engines.length,engine,match,i=0,fallbacks="q query term p wd query text".split(" ");for(i=0;i<length;i++){engine=search_engines[i];if(session.referrer_info.host.indexOf(engine.host)!==-1){session.search.engine=engine.name;session.search.query=session.referrer_info.query[engine.query];session.search.terms=session.search.query?session.search.query.split(" "):null;break}}if(session.search.engine===null&&session.referrer_info.search.length>1){for(i=0;i<fallbacks.length;i++){var terms=session.referrer_info.query[fallbacks[i]];if(terms){session.search.engine="Unknown";session.search.query=terms;session.search.terms=terms.split(" ");break}}}}else{session.prev_visit=session.last_visit;session.last_visit=(new Date).getTime();session.visits++;session.time_since_last_visit=session.last_visit-session.prev_visit}util.set_obj(cookie,session,expires);return session},html5_location:function(){return function(callback){nav.geolocation.getCurrentPosition(function(pos){pos.source="html5";callback(pos)},function(err){if(options.gapi_location){modules.gapi_location()(callback)}else{callback({error:true,source:"html5"})}})}},gapi_location:function(){return function(callback){var location=util.get_obj(options.location_cookie);if(!location||location.source!=="google"){win.gloader_ready=function(){if("google"in win){if(win.google.loader.ClientLocation){win.google.loader.ClientLocation.source="google";callback(win.google.loader.ClientLocation)}else{callback({error:true,source:"google"})}util.set_obj(options.location_cookie,win.google.loader.ClientLocation,options.location_cookie_timeout*60*60*1e3)}};util.embed_script("https://www.google.com/jsapi?callback=gloader_ready")}else{callback(location)}}},architecture:function(){var arch=n.userAgent.match(/x86_64|Win64|WOW64|x86-64|x64\;|AMD64|amd64/)||n.cpuClass==="x64"?"x64":"x86";return{arch:arch,is_x64:arch=="x64",is_x86:arch=="x68"}},ipinfodb_location:function(api_key){return function(callback){var location_cookie=util.get_obj(options.location_cookie);if(!location_cookie&&location_cookie.source==="ipinfodb"){win.ipinfocb=function(data){if(data.statusCode==="OK"){data.source="ipinfodb";util.set_obj(options.location_cookie,data,options.location_cookie*60*60*1e3);callback(data)}else{if(options.gapi_location){return modules.gapi_location()(callback)}else{callback({error:true,source:"ipinfodb",message:data.statusMessage})}}};util.embed_script("http://api.ipinfodb.com/v3/ip-city/?key="+api_key+"&format=json&callback=ipinfocb")}else{callback(location_cookie)}}}};var util={parse_url:function(url_str){var a=doc.createElement("a"),query={};a.href=url_str;var query_str=a.search.substr(1);if(query_str!=""){var pairs=query_str.split("&"),i=0,length=pairs.length,parts;for(;i<length;i++){parts=pairs[i].split("=");if(parts.length===2){query[parts[0]]=decodeURI(parts[1])}}}return{host:a.host,path:a.pathname,protocol:a.protocol,port:a.port===""?80:a.port,search:a.search,query:query}},set_cookie:function(cname,value,expires,options){if(!cname){return null}if(!options){options={}}if(value===null||value===undefined){expires=-1}if(expires){options.expires=(new Date).getTime()+expires}return doc.cookie=[encodeURIComponent(cname),"=",encodeURIComponent(String(value)),options.expires?"; expires="+new Date(options.expires).toUTCString():"","; path="+(options.path?options.path:"/"),options.domain?"; domain="+options.domain:"",win.location&&win.location.protocol==="https:"?"; secure":""].join("")},get_cookie:function(cookie_name,result){return(result=new RegExp("(?:^|; )"+encodeURIComponent(cookie_name)+"=([^;]*)").exec(doc.cookie))?decodeURIComponent(result[1]):null},embed_script:function(url){var element=doc.createElement("script");element.type="text/javascript";element.src=url;doc.getElementsByTagName("body")[0].appendChild(element)},package_obj:function(obj){if(obj){obj.version=API_VERSION;var ret=JSON.stringify(obj);delete obj.version;return ret}},set_obj:function(cname,value,expires,options){util.set_cookie(cname,util.package_obj(value),expires,options)},get_obj:function(cookie_name){var obj;try{obj=JSON.parse(util.get_cookie(cookie_name))}catch(e){}if(obj&&obj.version==API_VERSION){delete obj.version;return obj}}};if(options.get_object!=null){util.get_obj=options["get_object"]}if(options.set_object!=null){util.set_obj=options["set_object"]}var JSON={parse:win.JSON&&win.JSON.parse||function(data){if(typeof data!=="string"||!data){return null}return new Function("return "+data)()},stringify:win.JSON&&win.JSON.stringify||function(object){var type=typeof object;if(type!=="object"||object===null){if(type==="string"){return'"'+object+'"'}}else{var k,v,json=[],isArray=object&&object.constructor===Array;for(k in object){v=object[k];type=typeof v;if(type==="string")v='"'+v+'"';else if(type==="object"&&v!==null)v=this.stringify(v);json.push((isArray?"":'"'+k+'":')+v)}return(isArray?"[":"{")+json.join(",")+(isArray?"]":"}")}}};SessionRunner()};if(typeof window.exports==="undefined"){session_fetch(window,document,navigator)}else{window.exports.session=session_fetch}
\ No newline at end of file
+var session_fetch=function(win,doc,nav){"use strict";var API_VERSION=.4;var options={use_html5_location:false,ipinfodb_key:false,gapi_location:true,location_cookie:"location",location_cookie_timeout:5,session_timeout:32,session_cookie:"first_session",get_object:null,set_object:null};var SessionRunner=function(){win.session=win.session||{};win.session.contains=function(other_str){if(typeof other_str==="string"){return this.indexOf(other_str)!==-1}for(var i=0;i<other_str.length;i++){if(this.indexOf(other_str[i])!==-1){return true}}return false};if(win.session&&win.session.options){for(var option in win.session.options){options[option]=win.session.options[option]}}var unloaded_modules={api_version:API_VERSION,locale:modules.locale(),current_session:modules.session(),original_session:modules.session(options.session_cookie,options.session_timeout*24*60*60*1e3),browser:modules.browser(),plugins:modules.plugins(),time:modules.time(),device:modules.device()};if(options.use_html5_location){unloaded_modules.location=modules.html5_location()}else if(options.ipinfodb_key){unloaded_modules.location=modules.ipinfodb_location(options.ipinfodb_key)}else if(options.gapi_location){unloaded_modules.location=modules.gapi_location()}if(win.session&&win.session.start){var start=win.session.start}var asynchs=0,module,check_asynch=function(deinc){if(deinc){asynchs--}if(asynchs===0){if(start){start(win.session)}}};win.session={};for(var name in unloaded_modules){module=unloaded_modules[name];if(typeof module==="function"){try{module(function(data){win.session[name]=data;check_asynch(true)});asynchs++}catch(err){if(win.console&&typeof console.log==="function"){console.log(err);check_asynch(true)}}}else{win.session[name]=module}}check_asynch()};var browser={detect:function(){var ret={browser:this.search(this.data.browser),version:this.search(nav.userAgent)||this.search(nav.appVersion),os:this.search(this.data.os)};if(ret.os=="Linux"){var distros=["CentOS","Debian","Fedora","Gentoo","Mandriva","Mageia","Red Hat","Slackware","SUSE","Turbolinux","Ubuntu"];for(var i=0;i<distros.length;i++){if(nav.userAgent.toLowerCase().match(distros[i].toLowerCase())){ret.distro=distros[i];break}}}return ret},search:function(data){if(typeof data==="object"){for(var i=0;i<data.length;i++){var dataString=data[i].string,dataProp=data[i].prop;this.version_string=data[i].versionSearch||data[i].identity;if(dataString){if(dataString.indexOf(data[i].subString)!=-1){return data[i].identity}}else if(dataProp){return data[i].identity}}}else{var index=data.indexOf(this.version_string);if(index==-1)return;return parseFloat(data.substr(index+this.version_string.length+1))}},data:{browser:[{string:nav.userAgent,subString:"Edge",identity:"Edge"},{string:nav.userAgent,subString:"Chrome",identity:"Chrome"},{string:nav.userAgent,subString:"CriOS",identity:"Chrome",versionSearch:"CriOS"},{string:nav.userAgent,subString:"OmniWeb",versionSearch:"OmniWeb/",identity:"OmniWeb"},{string:nav.userAgent,subString:"PhantomJS",identity:"PhantomJS"},{string:nav.vendor,subString:"Apple",identity:"Safari",versionSearch:"Version"},{prop:win.opera,identity:"Opera",versionSearch:"Version"},{string:nav.vendor,subString:"iCab",identity:"iCab"},{string:nav.vendor,subString:"KDE",identity:"Konqueror"},{string:nav.userAgent,subString:"Firefox",identity:"Firefox"},{string:nav.userAgent,subString:"Fluid",identity:"Fluid",versionSearch:"FluidApp Version"},{string:nav.vendor,subString:"Camino",identity:"Camino"},{string:nav.userAgent,subString:"Netscape",identity:"Netscape"},{string:nav.userAgent,subString:"MSIE",identity:"Explorer",versionSearch:"MSIE"},{string:nav.userAgent,subString:"Trident",identity:"Explorer",versionSearch:"rv"},{string:nav.userAgent,subString:"Gecko",identity:"Mozilla",versionSearch:"rv"},{string:nav.userAgent,subString:"Mozilla",identity:"Netscape",versionSearch:"Mozilla"}],os:[{string:nav.platform,subString:"Win",identity:"Windows"},{string:nav.platform,subString:"Mac",identity:"Mac"},{string:nav.userAgent,subString:"iPhone",identity:"iPhone/iPod"},{string:nav.userAgent,subString:"iPad",identity:"iPad"},{string:nav.userAgent,subString:"Android",identity:"Android"},{string:nav.platform,subString:"Linux",identity:"Linux"}]}};var modules={browser:function(){return browser.detect()},time:function(){var d1=new Date,d2=new Date;d1.setMonth(0);d1.setDate(1);d2.setMonth(6);d2.setDate(1);return{tz_offset:-(new Date).getTimezoneOffset()/60,observes_dst:d1.getTimezoneOffset()!==d2.getTimezoneOffset()}},locale:function(){var lang=(nav.language||nav.browserLanguage||nav.systemLanguage||nav.userLanguage||"").split("-");if(lang.length==2){return{country:lang[1].toLowerCase(),lang:lang[0].toLowerCase()}}else if(lang){return{lang:lang[0].toLowerCase(),country:null}}else{return{lang:null,country:null}}},device:function(){var device={screen:{width:win.screen.width,height:win.screen.height}};var width,height;try{width=win.innerWidth||doc.documentElement.clientWidth||doc.body.clientWidth}catch(e){width=0}try{height=win.innerHeight||doc.documentElement.clientHeight||doc.body.clientHeight}catch(e){height=0}device.viewport={width:width,height:height};device.is_tablet=!!nav.userAgent.match(/(iPad|SCH-I800|xoom|kindle)/i);device.is_phone=!device.is_tablet&&!!nav.userAgent.match(/(iPhone|iPod|blackberry|android 0.5|htc|lg|midp|mmp|mobile|nokia|opera mini|palm|pocket|psp|sgh|smartphone|symbian|treo mini|Playstation Portable|SonyEricsson|Samsung|MobileExplorer|PalmSource|Benq|Windows Phone|Windows Mobile|IEMobile|Windows CE|Nintendo Wii)/i);device.is_mobile=device.is_tablet||device.is_phone;return device},plugins:function(){var check_plugin=function(name){if(nav.plugins){var plugin,i=0,length=nav.plugins.length;for(;i<length;i++){plugin=nav.plugins[i];if(plugin&&plugin.name&&plugin.name.toLowerCase().indexOf(name)!==-1){return true}}return false}return false};var check_activex_flash=function(versions){var found=true;for(var i=0;i<versions.length;i++){try{new ActiveXObject("ShockwaveFlash.ShockwaveFlash"+versions[i]);found=!0}catch(e){}if(found)return true}return false};return{flash:check_plugin("flash")||check_activex_flash([".7",".6",""]),silverlight:check_plugin("silverlight"),java:check_plugin("java"),quicktime:check_plugin("quicktime")}},session:function(cookie,expires){var session=util.get_obj(cookie);if(session==null){session={visits:1,start:(new Date).getTime(),last_visit:(new Date).getTime(),url:win.location.href,path:win.location.pathname,referrer:doc.referrer,referrer_info:util.parse_url(doc.referrer),search:{engine:null,query:null}};var search_engines=[{name:"Google",host:"google",query:"q"},{name:"Bing",host:"bing.com",query:"q"},{name:"Yahoo",host:"search.yahoo",query:"p"},{name:"AOL",host:"search.aol",query:"q"},{name:"Ask",host:"ask.com",query:"q"},{name:"Baidu",host:"baidu.com",query:"wd"}],length=search_engines.length,engine,i=0,fallbacks="q query term p wd query text".split(" ");for(i=0;i<length;i++){engine=search_engines[i];if(session.referrer_info.host.indexOf(engine.host)!==-1){session.search.engine=engine.name;session.search.query=session.referrer_info.query[engine.query];session.search.terms=session.search.query?session.search.query.split(" "):null;break}}if(session.search.engine===null&&session.referrer_info.search.length>1){for(i=0;i<fallbacks.length;i++){var terms=session.referrer_info.query[fallbacks[i]];if(terms){session.search.engine="Unknown";session.search.query=terms;session.search.terms=terms.split(" ");break}}}}else{session.prev_visit=session.last_visit;session.last_visit=(new Date).getTime();session.visits++;session.time_since_last_visit=session.last_visit-session.prev_visit}util.set_obj(cookie,session,expires);return session},html5_location:function(){return function(callback){nav.geolocation.getCurrentPosition(function(pos){pos.source="html5";callback(pos)},function(err){if(options.gapi_location){modules.gapi_location()(callback)}else{callback({error:true,source:"html5"})}})}},gapi_location:function(){return function(callback){var location=util.get_obj(options.location_cookie);if(!location||location.source!=="google"){win.gloader_ready=function(){if("google"in win){if(win.google.loader.ClientLocation){win.google.loader.ClientLocation.source="google";callback(win.google.loader.ClientLocation)}else{callback({error:true,source:"google"})}util.set_obj(options.location_cookie,win.google.loader.ClientLocation,options.location_cookie_timeout*60*60*1e3)}};util.embed_script("https://www.google.com/jsapi?callback=gloader_ready")}else{callback(location)}}},architecture:function(){var arch=nav.userAgent.match(/x86_64|Win64|WOW64|x86-64|x64\;|AMD64|amd64/)||nav.cpuClass==="x64"?"x64":"x86";return{arch:arch,is_x64:arch=="x64",is_x86:arch=="x68"}},ipinfodb_location:function(api_key){return function(callback){var location_cookie=util.get_obj(options.location_cookie);if(!location_cookie&&location_cookie.source==="ipinfodb"){win.ipinfocb=function(data){if(data.statusCode==="OK"){data.source="ipinfodb";util.set_obj(options.location_cookie,data,options.location_cookie*60*60*1e3);callback(data)}else{if(options.gapi_location){return modules.gapi_location()(callback)}else{callback({error:true,source:"ipinfodb",message:data.statusMessage})}}};util.embed_script("http://api.ipinfodb.com/v3/ip-city/?key="+api_key+"&format=json&callback=ipinfocb")}else{callback(location_cookie)}}}};var util={parse_url:function(url_str){var a=doc.createElement("a"),query={};a.href=url_str;var query_str=a.search.substr(1);if(query_str!=""){var pairs=query_str.split("&"),i=0,length=pairs.length,parts;for(;i<length;i++){parts=pairs[i].split("=");if(parts.length===2){query[parts[0]]=decodeURI(parts[1])}}}return{host:a.host,path:a.pathname,protocol:a.protocol,port:a.port===""?80:a.port,search:a.search,query:query}},set_cookie:function(cname,value,expires,options){if(!cname){return null}if(!options){options={}}if(value===null||value===undefined){expires=-1}if(expires){options.expires=(new Date).getTime()+expires}return doc.cookie=[encodeURIComponent(cname),"=",encodeURIComponent(String(value)),options.expires?"; expires="+new Date(options.expires).toUTCString():"","; path="+(options.path?options.path:"/"),options.domain?"; domain="+options.domain:"",win.location&&win.location.protocol==="https:"?"; secure":""].join("")},get_cookie:function(cookie_name,result){return(result=new RegExp("(?:^|; )"+encodeURIComponent(cookie_name)+"=([^;]*)").exec(doc.cookie))?decodeURIComponent(result[1]):null},embed_script:function(url){var element=doc.createElement("script");element.type="text/javascript";element.src=url;(doc.body||doc.getElementsByTagName("body")[0]||doc.head).appendChild(element)},package_obj:function(obj){if(obj){obj.version=API_VERSION;var ret=JSON.stringify(obj);delete obj.version;return ret}},set_obj:function(cname,value,expires,options){util.set_cookie(cname,util.package_obj(value),expires,options)},get_obj:function(cookie_name){var obj;try{obj=JSON.parse(util.get_cookie(cookie_name))}catch(e){}if(obj&&obj.version==API_VERSION){delete obj.version;return obj}}};if(options.get_object!=null){util.get_obj=options["get_object"]}if(options.set_object!=null){util.set_obj=options["set_object"]}var JSON={parse:win.JSON&&win.JSON.parse||function(data){if(typeof data!=="string"||!data){return null}return new Function("return "+data)()},stringify:win.JSON&&win.JSON.stringify||function(object){var type=typeof object;if(type!=="object"||object===null){if(type==="string"){return'"'+object+'"'}}else{var k,v,json=[],isArray=object&&object.constructor===Array;for(k in object){v=object[k];type=typeof v;if(type==="string")v='"'+v+'"';else if(type==="object"&&v!==null)v=this.stringify(v);json.push((isArray?"":'"'+k+'":')+v)}return(isArray?"[":"{")+json.join(",")+(isArray?"]":"}")}}};SessionRunner()};if(typeof window.exports==="undefined"){session_fetch(window,document,navigator)}else{window.exports.session=session_fetch}
diff --git a/test/spec/browser-spec.js b/test/spec/browser-spec.js
index b4e9d86..1e2ae34 100644
--- a/test/spec/browser-spec.js
+++ b/test/spec/browser-spec.js
@@ -1,11 +1,14 @@
 // @todo - can tests be dynamically created in Jasmine for this to work?
 
-var mock = create_mock();
 var _getTestHandler = function(testData, expectedResult) {
   return function() {
+    var mock = create_mock();
     mock.nav.userAgent = testData[3];
     mock.nav.appVersion = testData[2];
     mock.nav.platform = testData[1];
+    if (testData[4]) {
+      mock.nav.vendor = testData[4];
+    }
     mock.run_sess();
 
     var browser_data = mock.win.session.browser;
@@ -15,8 +18,16 @@ var _getTestHandler = function(testData, expectedResult) {
   };
 };
 
+var testBrowserData = function(tests, expected_results) {
+  for (var i = 0; i < tests.length; i++) {
+    var test = tests[i];
+    var expected_result = expected_results[i];
+    it(test[0], _getTestHandler(test, expected_result));
+  }
+};
+
 describe('IE Browser Names', function(){
-  var ie_tests = [
+  var tests = [
     ['msie 11',       'Win', '11.0', 'Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv 11.0) like Gecko'],
     ['msie 10',       'Win', '10.0', 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)'],
     ['msie 9',        'Win',  '9.0', 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)'],
@@ -25,68 +36,93 @@ describe('IE Browser Names', function(){
     ['msie 8 .net',   'Win',  '8.0', 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)'],
     ['msie 8 .net 2', 'Win',  '8.0', 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)']
   ];
-  var ie_tests_expected_result = [
+  var expected_results = [
     { browser: 'Explorer', version: 11, os: 'Windows' },
     { browser: 'Explorer', version: 10, os: 'Windows' },
     { browser: 'Explorer', version:  9, os: 'Windows' },
     { browser: 'Explorer', version:  8, os: 'Windows' },
     { browser: 'Explorer', version:  9, os: 'Windows' },
     { browser: 'Explorer', version:  8, os: 'Windows' },
-    { browser: 'Explorer', version:  8, os: 'Windows' },
+    { browser: 'Explorer', version:  8, os: 'Windows' }
   ];
-  for (var i = 0; i < ie_tests.length; i++) {
-    var ie_test = ie_tests[i];
-    var expected_result = ie_tests_expected_result[i];
-    it(ie_test[0], _getTestHandler(ie_test, expected_result));
-  }
+  testBrowserData(tests, expected_results);
 });
 
 describe('Edge Browser Names', function (){
-  var edge_tests = [
+  var tests = [
     ['edge', 'Win', '12', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.10240']
-    ];
-  var edge_tests_expected_result = [
+  ];
+  var expected_results = [
     { browser: 'Edge', version: 12.1024, os: 'Windows' }
-   ];
-  for (var i = 0; i < edge_tests.length; i++) {
-    var edge_test = edge_tests[i];
-    var expected_result = edge_tests_expected_result[i];
-    it(edge_test[0], _getTestHandler(edge_test, expected_result));
-  }
+  ];
+  testBrowserData(tests, expected_results);
+});
 
+describe('PhantomJS Browser Names', function (){
+  var tests = [
+    ['phantomjs 2.0', 'Win32', '5.0', 'Mozilla/5.0 (Unknown; Linux x86_64) AppleWebKit/538.1 (KHTML, like Gecko) PhantomJS/2.0.1-development Safari/538.1', 'Apple Computer, Inc.'],
+    ['phantomjs 1.9', 'Win32', '5.0', 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/534.34 (KHTML, like Gecko) PhantomJS/1.9.8 Safari/534.34', 'Apple Computer, Inc.']
+  ];
+  var expected_results = [
+    { browser: 'PhantomJS', version: 2, os: 'Windows' },
+    { browser: 'PhantomJS', version: 1.9, os: 'Windows' }
+  ];
+  testBrowserData(tests, expected_results);
 });
 
 describe('Firefox Browser Names', function(){
-  var firefox_tests = [
-    ['firefox 9.0.1', '9.0.1',  'Mozilla/5.0 (Windows NT 5.1; rv:9.0.1) Gecko/20100101 Firefox/9.0.1'],
-    ['firefox 8.0.1', '8.0.1',  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:8.0.1) Gecko/20100101 Firefox/8.0.1'],
-    ['firefox 3.6',   '3.6.24', 'Mozilla/5.0 (X11; U; Linux i686; sk; rv:1.9.2.24) Gecko/20111107 Ubuntu/10.04 (lucid) Firefox/3.6.24'],
-    ['firefox beta',  '11.0a2', 'Mozilla/5.0 (X11; Linux x86_64; rv:11.0a2) Gecko/20120107 Firefox/11.0a2']
+  var tests = [
+    // ['firefox 9.0.1', 'Win32', '?', 'Mozilla/5.0 (Windows NT 5.1; rv:9.0.1) Gecko/20100101 Firefox/9.0.1'],
+    // ['firefox 8.0.1', '?', '?', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:8.0.1) Gecko/20100101 Firefox/8.0.1'],
+    // ['firefox 3.6', '?', '?', 'Mozilla/5.0 (X11; U; Linux i686; sk; rv:1.9.2.24) Gecko/20111107 Ubuntu/10.04 (lucid) Firefox/3.6.24'],
+    // ['firefox beta', 'Linux x86_64', '5.0 (X11)', 'Mozilla/5.0 (X11; Linux x86_64; rv:11.0a2) Gecko/20120107 Firefox/11.0a2']
+    ['firefox 47', 'Win32', '5.0 (Windows)', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:47.0) Gecko/20100101 Firefox/47.0'],
+    ['firefox 48', 'Linux x86_64', '5.0 (X11)', 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:48.0) Gecko/20100101 Firefox/48.0']
+  ];
+  var expected_results = [
+    { browser: 'Firefox', version: 47, os: 'Windows' },
+    { browser: 'Firefox', version: 48, os: 'Linux' }
   ];
+  testBrowserData(tests, expected_results);
 });
 
 describe('Safari Browser Names', function(){
-  var safari_tests = [
-    ['ipad test',      '5.1',   'Mozilla/5.0 (iPad; CPU OS 5_0_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A405 Safari/7534.48.3'],
-    ['intel mac test', '5.1.2', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/534.52.7 (KHTML, like Gecko) Version/5.1.2 Safari/534.52.7'],
-    ['5.0 intel mac',  '5.0',   'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_3; en-us) AppleWebKit/533.16 (KHTML, like Gecko) Version/5.0 Safari/533.16'],
-    ['5.1 ipad',       '5.1',   'Mozilla/5.0 (iPad; CPU OS 5_0_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A405 Safari/7534.48.3'],
-    ['4.1 iphone',     '5.1',   'Mozilla/5.0 (iPhone; CPU iPhone OS 5_0_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A405 Safari/7534.48.3']
+  var tests = [
+    ['8.0 mac intel', 'MacIntel', '', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/600.8.9 (KHTML, like Gecko) Version/8.0.8 Safari/600.8.9', 'Apple Computer, Inc.'],
+    //['ipad test',      '5.1',   'Mozilla/5.0 (iPad; CPU OS 5_0_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A405 Safari/7534.48.3'],
+    //['intel mac test', '5.1.2', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/534.52.7 (KHTML, like Gecko) Version/5.1.2 Safari/534.52.7'],
+    //['5.0 intel mac',  '5.0',   'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_3; en-us) AppleWebKit/533.16 (KHTML, like Gecko) Version/5.0 Safari/533.16'],
+    //['5.1 ipad',       '5.1',   'Mozilla/5.0 (iPad; CPU OS 5_0_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A405 Safari/7534.48.3'],
+    //['4.1 iphone',     '5.1',   'Mozilla/5.0 (iPhone; CPU iPhone OS 5_0_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A405 Safari/7534.48.3']
+  ];
+  var expected_results = [
+    { browser: 'Safari', version: 8, os: 'Mac' }
   ];
+  testBrowserData(tests, expected_results);
+});
 
+describe('Fluid App Names', function(){
+  var tests = [
+    ['2249', 'MacIntel', '', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_5) AppleWebKit/601.6.17 (KHTML, like Gecko) FluidApp Version/2249 Safari/601.6.17'],
+    ['1955', 'MacIntel', '', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/1601.7.7 (KHTML, like Gecko) FluidApp Version/1955 Safari/1601.7.7']
+  ];
+  var expected_results = [
+    { browser: 'Fluid', version: 2249, os: 'Mac' },
+    { browser: 'Fluid', version: 1955, os: 'Mac' }
+  ];
+  testBrowserData(tests, expected_results);
 });
 
 describe('Chrome Browser Names', function(){
-  var chrome_tests = [
-    ['chrome 44', 'Win', '44',  'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.125 Safari/537.36'], 
+  var tests = [
+    ['chrome 52', 'MacIntel', '5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Safari/537.36', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Safari/537.36'],
+    ['chrome 52 for iPhone', 'iPhone', '', 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_0 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/52.0.2743.84 Mobile/14A5345a Safari/601.1.46'],
+    ['chrome 44', 'Win', '5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.125 Safari/537.36', 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.125 Safari/537.36']
   ];
-
-  var chrome_tests_expected_result = [
+  var expected_results = [
+    { browser: 'Chrome', version: 52, os: 'Mac' },
+    { browser: 'Chrome', version: 52, os: 'iPhone/iPod' },
     { browser: 'Chrome', version: 44, os: 'Windows' }
-   ];
-  for (var i = 0; i < chrome_tests.length; i++) {
-    var chrome_test = chrome_tests[i];
-    var expected_result = chrome_tests_expected_result[i];
-    it(chrome_test[0], _getTestHandler(chrome_test, expected_result));
-  }
+  ];
+  testBrowserData(tests, expected_results);
 });