diff --git a/VolantisKeyboard/res/values-da/strings.xml b/VolantisKeyboard/res/values-da/strings.xml
index 57e1887..fb2b8c2 100644
--- a/VolantisKeyboard/res/values-da/strings.xml
+++ b/VolantisKeyboard/res/values-da/strings.xml
@@ -3,7 +3,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="8309373558371161520">"Volantis-tastatur"</string>
     <string name="keyboard_layouts_label" msgid="771692943642467584">"Kompakt Nexus-tastatur"</string>
-    <string name="keyboard_layout_volantis_english_uk_label" msgid="1425137404576186880">"engelsk (UK)"</string>
+    <string name="keyboard_layout_volantis_english_uk_label" msgid="1425137404576186880">"Engelsk (UK)"</string>
     <string name="keyboard_layout_volantis_english_us_label" msgid="953130059365065614">"Engelsk (USA)"</string>
     <string name="keyboard_layout_volantis_english_us_intl_label" msgid="8444053619141689693">"Engelsk (international amerikansk)"</string>
     <string name="keyboard_layout_volantis_german_label" msgid="1115175249339065508">"Tysk"</string>
diff --git a/VolantisKeyboard/res/values-fa/strings.xml b/VolantisKeyboard/res/values-fa/strings.xml
index b89ba1e..87eac52 100644
--- a/VolantisKeyboard/res/values-fa/strings.xml
+++ b/VolantisKeyboard/res/values-fa/strings.xml
@@ -4,7 +4,7 @@
     <string name="app_label" msgid="8309373558371161520">"Volantis Keyboard"</string>
     <string name="keyboard_layouts_label" msgid="771692943642467584">"‏صفحه‌کلید فشرده Nexus"</string>
     <string name="keyboard_layout_volantis_english_uk_label" msgid="1425137404576186880">"انگلیسی (بریتانیا)"</string>
-    <string name="keyboard_layout_volantis_english_us_label" msgid="953130059365065614">"انگلیسی (امریکا)"</string>
+    <string name="keyboard_layout_volantis_english_us_label" msgid="953130059365065614">"انگلیسی (آمریکا)"</string>
     <string name="keyboard_layout_volantis_english_us_intl_label" msgid="8444053619141689693">"انگلیسی (آمریکایی بین‌المللی)"</string>
     <string name="keyboard_layout_volantis_german_label" msgid="1115175249339065508">"آلمانی"</string>
     <string name="keyboard_layout_volantis_french_label" msgid="7039437279465504539">"فرانسوی"</string>
diff --git a/VolantisKeyboard/res/values-kn-rIN/strings.xml b/VolantisKeyboard/res/values-kn-rIN/strings.xml
index 8defbf3..a5e95d9 100644
--- a/VolantisKeyboard/res/values-kn-rIN/strings.xml
+++ b/VolantisKeyboard/res/values-kn-rIN/strings.xml
@@ -3,7 +3,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="8309373558371161520">"ವೊಲಾಂಟಿಸ್ ಕೀಬೋರ್ಡ್"</string>
     <string name="keyboard_layouts_label" msgid="771692943642467584">"Nexus ಕಾಂಪ್ಯಾಕ್ಟ್ ಕೀಬೋರ್ಡ್"</string>
-    <string name="keyboard_layout_volantis_english_uk_label" msgid="1425137404576186880">"ಇಂಗ್ಲಿಷ್ (ಯುಕೆ)"</string>
+    <string name="keyboard_layout_volantis_english_uk_label" msgid="1425137404576186880">"ಇಂಗ್ಲಿಷ್ (UK)"</string>
     <string name="keyboard_layout_volantis_english_us_label" msgid="953130059365065614">"ಇಂಗ್ಲಿಷ್ (US)"</string>
     <string name="keyboard_layout_volantis_english_us_intl_label" msgid="8444053619141689693">"ಇಂಗ್ಲಿಷ್ (US ಅಂತರರಾಷ್ಟ್ರೀಯ)"</string>
     <string name="keyboard_layout_volantis_german_label" msgid="1115175249339065508">"ಜರ್ಮನ್"</string>
diff --git a/VolantisKeyboard/res/values-pa-rIN/strings.xml b/VolantisKeyboard/res/values-pa-rIN/strings.xml
index e895905..d6f1b0a 100644
--- a/VolantisKeyboard/res/values-pa-rIN/strings.xml
+++ b/VolantisKeyboard/res/values-pa-rIN/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="8309373558371161520">"Volantis ਕੀ-ਬੋਰਡ"</string>
-    <string name="keyboard_layouts_label" msgid="771692943642467584">"Nexus ਕੰਪੈਕਟ ਕੀ-ਬੋਰਡ"</string>
+    <string name="app_label" msgid="8309373558371161520">"Volantis ਕੀਬੋਰਡ"</string>
+    <string name="keyboard_layouts_label" msgid="771692943642467584">"Nexus ਕੰਪੈਕਟ ਕੀਬੋਰਡ"</string>
     <string name="keyboard_layout_volantis_english_uk_label" msgid="1425137404576186880">"ਅੰਗਰੇਜ਼ੀ (ਯੂਕੇ)"</string>
     <string name="keyboard_layout_volantis_english_us_label" msgid="953130059365065614">"ਅੰਗਰੇਜ਼ੀ (ਅਮਰੀਕਾ)"</string>
     <string name="keyboard_layout_volantis_english_us_intl_label" msgid="8444053619141689693">"ਅੰਗਰੇਜ਼ੀ (ਅਮਰੀਕਾ ਅੰਤਰਰਾਸ਼ਟਰੀ)"</string>
diff --git a/VolantisKeyboard/res/values-tl/strings.xml b/VolantisKeyboard/res/values-tl/strings.xml
index cce6e2c..68541f5 100644
--- a/VolantisKeyboard/res/values-tl/strings.xml
+++ b/VolantisKeyboard/res/values-tl/strings.xml
@@ -3,9 +3,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="8309373558371161520">"Volantis Keyboard"</string>
     <string name="keyboard_layouts_label" msgid="771692943642467584">"Nexus Compact Keyboard"</string>
-    <string name="keyboard_layout_volantis_english_uk_label" msgid="1425137404576186880">"English (UK)"</string>
-    <string name="keyboard_layout_volantis_english_us_label" msgid="953130059365065614">"English (US)"</string>
-    <string name="keyboard_layout_volantis_english_us_intl_label" msgid="8444053619141689693">"English (US International)"</string>
+    <string name="keyboard_layout_volantis_english_uk_label" msgid="1425137404576186880">"Ingles (UK)"</string>
+    <string name="keyboard_layout_volantis_english_us_label" msgid="953130059365065614">"Ingles (US)"</string>
+    <string name="keyboard_layout_volantis_english_us_intl_label" msgid="8444053619141689693">"Ingles (US International)"</string>
     <string name="keyboard_layout_volantis_german_label" msgid="1115175249339065508">"German"</string>
     <string name="keyboard_layout_volantis_french_label" msgid="7039437279465504539">"French"</string>
     <string name="keyboard_layout_volantis_french_ca_label" msgid="773887798068625483">"French (Canada)"</string>
diff --git a/audio/Android.mk b/audio/Android.mk
index 9e572ce..c6bbc6b 100644
--- a/audio/Android.mk
+++ b/audio/Android.mk
@@ -5,7 +5,7 @@
 
 include $(MY_LOCAL_PATH)/hal/Android.mk
 include $(MY_LOCAL_PATH)/soundtrigger/Android.mk
-include $(MY_LOCAL_PATH)/visualizer/Android.mk
+#include $(MY_LOCAL_PATH)/visualizer/Android.mk
 
 endif
 endif
diff --git a/device.mk b/device.mk
index efb7467..10ffe3c 100644
--- a/device.mk
+++ b/device.mk
@@ -232,11 +232,15 @@
     ro.hwui.disable_scissor_opt=true \
     ro.bt.bdaddr_path=/sys/module/flounder_bdaddress/parameters/bdaddress \
     ro.frp.pst=/dev/block/platform/sdhci-tegra.3/by-name/PST \
+    ro.product.first_api_level=23 \
     ro.ril.def.agps.mode=1 \
     persist.tegra.compositor=glcomposer
 
 # setup dalvik vm configs.
 $(call inherit-product, frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk)
+# N9 has only two CPUs, so drop dex2oat pressure after boot at runtime
+PRODUCT_PROPERTY_OVERRIDES += \
+    dalvik.vm.dex2oat-threads=1
 
 # for off charging mode
 PRODUCT_PACKAGES += \
@@ -249,8 +253,7 @@
     audio.a2dp.default \
     audio.usb.default \
     audio.r_submix.default \
-    libhtcacoustic \
-    libnvvisualizer
+    libhtcacoustic
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.audio.monitorRotation=true
 
diff --git a/gps/bcm/glgps b/gps/bcm/glgps
index ef25629..55adb23 100755
--- a/gps/bcm/glgps
+++ b/gps/bcm/glgps
Binary files differ
diff --git a/gps/bcm/lib64/gps.bcm47521.so b/gps/bcm/lib64/gps.bcm47521.so
index 5713f29..d4d6f3e 100644
--- a/gps/bcm/lib64/gps.bcm47521.so
+++ b/gps/bcm/lib64/gps.bcm47521.so
Binary files differ
diff --git a/gps/qct/gps.conf b/gps/qct/gps.conf
index cd74898..129e239 100644
--- a/gps/qct/gps.conf
+++ b/gps/qct/gps.conf
@@ -1,7 +1,9 @@
 NTP_SERVER=north-america.pool.ntp.org
-XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra2.bin
-XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra2.bin
-XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra2.bin
+
+XTRA_SERVER_1=https://xtra1.gpsonextra.net/xtra2.bin
+XTRA_SERVER_2=https://xtra2.gpsonextra.net/xtra2.bin
+XTRA_SERVER_3=https://xtra3.gpsonextra.net/xtra2.bin
+
 SUPL_HOST=supl.google.com
 SUPL_PORT=7275
 SUPL_TLS_HOST=supl.google.com