diff --git a/browscap.ini b/browscap.ini
index 8c02ded..bc11ffa 100644
--- a/browscap.ini
+++ b/browscap.ini
@@ -2,7 +2,7 @@
 
 [Browscap_Version]
 Version=5003
-Updated=Fri, 11 May 2012 01:28:05 -0000
+Updated=Tue, 15 May 2012 18:29:25 -0000
 Beta=True
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; DefaultProperties
@@ -115,14 +115,6 @@ X_Parent=Baidu
 Parent=Baidu
 Browser=Baidu Union
 
-[*Baiduspider-favo*]
-AgentID=19154
-MasterParent=false
-LiteMode=true
-X_Parent=Baidu
-Parent=Baidu
-Browser=Baidu Baidu bookmark
-
 [*Baiduspider-favo*]
 AgentID=19155
 MasterParent=false
@@ -711,14 +703,6 @@ Version=3.0
 MajorVer=3
 MinorVer=0
 
-[Mozilla/5.0 (compatible; Yahoo! Slurp*;*http://help.yahoo.com/help/us/ysearch/slurp)]
-AgentID=10499
-MasterParent=false
-LiteMode=true
-X_Parent=Yahoo
-Parent=Yahoo
-Browser=Yahoo! Slurp
-
 [Mozilla/5.0 (compatible; Yahoo! Verifier/*)]
 AgentID=10597
 MasterParent=false
@@ -5257,14 +5241,6 @@ X_Parent=Download Managers
 Parent=Download Managers
 Browser=BitBeamer
 
-[BitTorrent/*]
-AgentID=3934
-MasterParent=false
-LiteMode=false
-X_Parent=Download Managers
-Parent=Download Managers
-Browser=BitTorrent
-
 [DA *]
 AgentID=426
 MasterParent=false
@@ -12311,6 +12287,8 @@ X_Parent=Chrome 18.0
 Parent=Chrome 18.0
 Platform=Android
 Platform_Version=1.0
+Win32=false
+isMobileDevice=true
 
 [Mozilla/5.0 (Linux*Android 1.1*)*AppleWebKit/*(*KHTML, like Gecko*)*Chrome/18.*Safari/*]
 AgentID=20096
@@ -12320,6 +12298,8 @@ X_Parent=Chrome 18.0
 Parent=Chrome 18.0
 Platform=Android
 Platform_Version=1.1
+Win32=false
+isMobileDevice=true
 
 [Mozilla/5.0 (Linux*Android 1.5*)*AppleWebKit/*(*KHTML, like Gecko*)*Chrome/18.*Safari/*]
 AgentID=20097
@@ -12329,6 +12309,8 @@ X_Parent=Chrome 18.0
 Parent=Chrome 18.0
 Platform=Android
 Platform_Version=1.5
+Win32=false
+isMobileDevice=true
 
 [Mozilla/5.0 (Linux*Android 1.6*)*AppleWebKit/*(*KHTML, like Gecko*)*Chrome/18.*Safari/*]
 AgentID=20098
@@ -12338,6 +12320,8 @@ X_Parent=Chrome 18.0
 Parent=Chrome 18.0
 Platform=Android
 Platform_Version=1.6
+Win32=false
+isMobileDevice=true
 
 [Mozilla/5.0 (Linux*Android 2.0*)*AppleWebKit/*(*KHTML, like Gecko*)*Chrome/18.*Safari/*]
 AgentID=20099
@@ -12347,6 +12331,8 @@ X_Parent=Chrome 18.0
 Parent=Chrome 18.0
 Platform=Android
 Platform_Version=2.0
+Win32=false
+isMobileDevice=true
 
 [Mozilla/5.0 (Linux*Android 2.1*)*AppleWebKit/*(*KHTML, like Gecko*)*Chrome/18.*Safari/*]
 AgentID=20100
@@ -12356,6 +12342,8 @@ X_Parent=Chrome 18.0
 Parent=Chrome 18.0
 Platform=Android
 Platform_Version=2.1
+Win32=false
+isMobileDevice=false
 
 [Mozilla/5.0 (Linux*Android 2.2*)*AppleWebKit/*(*KHTML, like Gecko*)*Chrome/18.*Safari/*]
 AgentID=20101
@@ -12365,6 +12353,8 @@ X_Parent=Chrome 18.0
 Parent=Chrome 18.0
 Platform=Android
 Platform_Version=2.2
+Win32=false
+isMobileDevice=false
 
 [Mozilla/5.0 (Linux*Android 2.3*)*AppleWebKit/*(*KHTML, like Gecko*)*Chrome/18.*Safari/*]
 AgentID=20102
@@ -12374,6 +12364,8 @@ X_Parent=Chrome 18.0
 Parent=Chrome 18.0
 Platform=Android
 Platform_Version=2.3
+Win32=false
+isMobileDevice=false
 
 [Mozilla/5.0 (Linux*Android 4.0*)*AppleWebKit/*(*KHTML, like Gecko*)*Chrome/18.*Safari/*]
 AgentID=20103
@@ -12383,6 +12375,8 @@ X_Parent=Chrome 18.0
 Parent=Chrome 18.0
 Platform=Android
 Platform_Version=4.0
+Win32=false
+isMobileDevice=false
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Chrome 19.0
 
@@ -17890,7 +17884,7 @@ LiteMode=true
 X_Parent=Mobile Safari 3.0
 Parent=DefaultProperties
 Comment=Mobile Safari 3.0
-Browser=Safari
+Browser=Mobile Safari
 Version=3.0
 MajorVer=3
 MinorVer=0
@@ -17916,26 +17910,6 @@ Platform_Version=1.0
 Device_Name=iPhone
 Device_Maker=Apple
 
-[Mozilla/5.0 (iPhone*CPU like Mac OS X*)*AppleWebKit/*(*KHTML, like Gecko*)*Version/3.0*Mobile/*Safari/*]
-AgentID=19962
-MasterParent=false
-LiteMode=true
-X_Parent=Mobile Safari 3.0
-Parent=Mobile Safari 3.0
-Platform_Version=1.0
-Device_Name=iPhone
-Device_Maker=Apple
-
-[Mozilla/5.0 (iPhone*CPU like Mac OS X*)*AppleWebKit/*(*KHTML, like Gecko*)*Version/3.0*Mobile/*Safari/*]
-AgentID=19963
-MasterParent=false
-LiteMode=true
-X_Parent=Mobile Safari 3.0
-Parent=Mobile Safari 3.0
-Platform_Version=1.0
-Device_Name=iPhone
-Device_Maker=Apple
-
 [Mozilla/5.0 (iPhone*CPU like Mac OS X*)*AppleWebKit/*(KHTML, like Gecko)*]
 AgentID=19967
 MasterParent=false
@@ -17946,46 +17920,6 @@ Platform_Version=1.0
 Device_Name=iPhone
 Device_Maker=Apple
 
-[Mozilla/5.0 (iPhone*CPU like Mac OS X*)*AppleWebKit/*(KHTML, like Gecko)*]
-AgentID=19968
-MasterParent=false
-LiteMode=true
-X_Parent=Mobile Safari 3.0
-Parent=Mobile Safari 3.0
-Platform_Version=1.0
-Device_Name=iPhone
-Device_Maker=Apple
-
-[Mozilla/5.0 (iPhone*CPU like Mac OS X*)*AppleWebKit/*(KHTML, like Gecko)*]
-AgentID=19969
-MasterParent=false
-LiteMode=true
-X_Parent=Mobile Safari 3.0
-Parent=Mobile Safari 3.0
-Platform_Version=1.0
-Device_Name=iPhone
-Device_Maker=Apple
-
-[Mozilla/5.0 (iPhone*CPU like Mac OS X*)*AppleWebKit/*(KHTML, like Gecko)*Mobile/*]
-AgentID=19964
-MasterParent=false
-LiteMode=true
-X_Parent=Mobile Safari 3.0
-Parent=Mobile Safari 3.0
-Platform_Version=1.0
-Device_Name=iPhone
-Device_Maker=Apple
-
-[Mozilla/5.0 (iPhone*CPU like Mac OS X*)*AppleWebKit/*(KHTML, like Gecko)*Mobile/*]
-AgentID=19965
-MasterParent=false
-LiteMode=true
-X_Parent=Mobile Safari 3.0
-Parent=Mobile Safari 3.0
-Platform_Version=1.0
-Device_Name=iPhone
-Device_Maker=Apple
-
 [Mozilla/5.0 (iPhone*CPU like Mac OS X*)*AppleWebKit/*(KHTML, like Gecko)*Mobile/*]
 AgentID=19966
 MasterParent=false
@@ -18035,7 +17969,7 @@ LiteMode=true
 X_Parent=Mobile Safari 3.1
 Parent=DefaultProperties
 Comment=Mobile Safari 3.1
-Browser=Safari
+Browser=Mobile Safari
 Version=3.1
 MajorVer=3
 MinorVer=1
@@ -18252,7 +18186,7 @@ LiteMode=true
 X_Parent=Mobile Safari 4.0
 Parent=DefaultProperties
 Comment=Mobile Safari 4.0
-Browser=Safari
+Browser=Mobile Safari
 Version=4.0
 MajorVer=4
 MinorVer=0
@@ -18593,7 +18527,7 @@ LiteMode=true
 X_Parent=Mobile Safari 5.0
 Parent=DefaultProperties
 Comment=Mobile Safari 5.0
-Browser=Safari
+Browser=Mobile Safari
 Version=5.0
 MajorVer=5
 MinorVer=0
@@ -18810,7 +18744,7 @@ LiteMode=true
 X_Parent=Mobile Safari 5.1
 Parent=DefaultProperties
 Comment=Mobile Safari 5.1
-Browser=Safari
+Browser=Mobile Safari
 Version=5.1
 MajorVer=5
 MinorVer=1
@@ -38593,7 +38527,7 @@ LiteMode=false
 X_Parent=Fennec 1.0
 Parent=DefaultProperties
 Comment=Fennec 1.0
-Browser=Firefox Mobile
+Browser=Fennec
 Version=1.0
 MajorVer=1
 MinorVer=0
@@ -38824,10 +38758,10 @@ RenderingEngine_Name=Gecko
 RenderingEngine_Version=1.9
 RenderingEngine_Description=For Firefox, Camino, K-Meleon, SeaMonkey, Netscape, and other Gecko-based browsers.
 
-[Mozilla/5.0 (Android; Linux*; rv:2.*) Gecko/* Firefox/* Fennec/4.0*]
+[Mozilla/5.0 (Android; Linux*; rv:2.*) Gecko/* Firefox/* Fennec/5.0*]
 AgentID=19846
 MasterParent=false
-LiteMode=true
+LiteMode=false
 X_Parent=Fennec 5.0
 Parent=Fennec 5.0
 Platform=Android
@@ -38917,10 +38851,10 @@ RenderingEngine_Name=Gecko
 RenderingEngine_Version=1.9
 RenderingEngine_Description=For Firefox, Camino, K-Meleon, SeaMonkey, Netscape, and other Gecko-based browsers.
 
-[Mozilla/5.0 (Android; Linux*; rv:2.*) Gecko/* Firefox/* Fennec/4.0*]
+[Mozilla/5.0 (Android; Linux*; rv:2.*) Gecko/* Firefox/* Fennec/6.0*]
 AgentID=19853
 MasterParent=false
-LiteMode=true
+LiteMode=false
 X_Parent=Fennec 6.0
 Parent=Fennec 6.0
 Platform=Android
@@ -39020,10 +38954,10 @@ RenderingEngine_Name=Gecko
 RenderingEngine_Version=1.9
 RenderingEngine_Description=For Firefox, Camino, K-Meleon, SeaMonkey, Netscape, and other Gecko-based browsers.
 
-[Mozilla/5.0 (Android; Linux*; rv:2.*) Gecko/* Firefox/* Fennec/4.0*]
+[Mozilla/5.0 (Android; Linux*; rv:2.*) Gecko/* Firefox/* Fennec/7.0*]
 AgentID=19860
 MasterParent=false
-LiteMode=true
+LiteMode=false
 X_Parent=Fennec 7.0
 Parent=Fennec 7.0
 Platform=Android