diff --git a/80cfw b/80cfw
deleted file mode 100644
index ba04436f..00000000
--- a/80cfw
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/system/bin/sh
-#
-# Copy camera firmware to /data/cfw
-#
-
-busybox cp /system/vendor/firmware/SlimISP_GD.bin /data/cfw/SlimISP_GD.bin
-busybox cp /system/vendor/firmware/SlimISP_ZD.bin /data/cfw/SlimISP_ZD.bin
-busybox chown system /data/cfw/*
-busybox chgrp media /data/cfw/*
-busybox chmod 0775 /data/cfw/*
diff --git a/DeviceSettings/res/values/strings.xml b/DeviceSettings/res/values/strings.xml
index e842ae42..5247b073 100644
--- a/DeviceSettings/res/values/strings.xml
+++ b/DeviceSettings/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Galaxy S III Settings</string>
+    <string name="app_name">Galaxy Note II Settings</string>
 
     <string name="category_haptic_title">Haptic</string>
     <string name="vibrator_subcat_title">Vibrator</string>
diff --git a/n7100.mk b/n7100.mk
index 7766fce6..55af560d 100644
--- a/n7100.mk
+++ b/n7100.mk
@@ -44,12 +44,12 @@ PRODUCT_COPY_FILES := \
     $(LOCAL_PATH)/ueventd.smdk4x12.rc:recovery/root/ueventd.smdk4x12.rc
 
 # Camera FW
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/80cfw:system/etc/init.d/80cfw
+# PRODUCT_COPY_FILES += \
+#    $(LOCAL_PATH)/80cfw:system/etc/init.d/80cfw
 
 # Audio
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/tiny_hw.xml:system/etc/sound/m0 \
+    $(LOCAL_PATH)/configs/tiny_hw.xml:system/etc/sound/t03g \
     $(LOCAL_PATH)/configs/audio_policy.conf:system/etc/audio_policy.conf
 
 # Vold and Storage
diff --git a/proprietary-files.sh b/proprietary-files.sh
index 88077db8..5b508ff1 100644
--- a/proprietary-files.sh
+++ b/proprietary-files.sh
@@ -51,6 +51,8 @@ PRODUCT_COPY_FILES += \\
     \$(LOCAL_PATH)/proprietary/system/bin/bintvoutservice:system/bin/bintvoutservice \\
     \$(LOCAL_PATH)/proprietary/system/bin/gps.cer:system/bin/gps.cer \\
     \$(LOCAL_PATH)/proprietary/system/bin/gpsd:system/bin/gpsd \\
+    \$(LOCAL_PATH)/proprietary/system/bin/sensorservice:system/bin/sensorservice \\
+    \$(LOCAL_PATH)/proprietary/system/bin/sensorhubservice:system/bin/sensorhubservice \\
     \$(LOCAL_PATH)/proprietary/system/bin/lpmkey:system/bin/lpmkey \\
     \$(LOCAL_PATH)/proprietary/system/bin/playlpm:system/bin/playlpm \\
     \$(LOCAL_PATH)/proprietary/system/bin/rild:system/bin/rild
@@ -86,11 +88,15 @@ PRODUCT_COPY_FILES += \\
     \$(LOCAL_PATH)/proprietary/system/lib/hw/gps.exynos4.so:system/lib/hw/gps.exynos4.so \\
     \$(LOCAL_PATH)/proprietary/system/lib/hw/gralloc.smdk4x12.so:system/lib/hw/gralloc.smdk4x12.so \\
     \$(LOCAL_PATH)/proprietary/system/lib/hw/sensors.smdk4x12.so:system/lib/hw/sensors.smdk4x12.so \\
+    \$(LOCAL_PATH)/proprietary/system/lib/hw/sensorhubs.smdk4x12.so:system/lib/hw/sensorhubs.smdk4x12.so \\
     \$(LOCAL_PATH)/proprietary/system/lib/hw/hwcomposer.smdk4x12.so:system/lib/hw/hwcomposer.smdk4x12.so
 
 PRODUCT_COPY_FILES += \\
     \$(LOCAL_PATH)/proprietary/system/lib/libril.so:system/lib/libril.so \\
     \$(LOCAL_PATH)/proprietary/system/lib/libsec-ril.so:system/lib/libsec-ril.so \\
+    \$(LOCAL_PATH)/proprietary/system/lib/libsensorservice.so:system/lib/libsensorservice.so \\
+    \$(LOCAL_PATH)/proprietary/system/lib/libsensorhubservice.so:system/lib/libsensorhubservice.so \\
+    \$(LOCAL_PATH)/proprietary/system/lib/libsec-ril.so:system/lib/libsec-ril.so \\
     \$(LOCAL_PATH)/proprietary/system/lib/libakm.so:system/lib/libakm.so \\
     \$(LOCAL_PATH)/proprietary/system/lib/libsecion.so:system/lib/libsecion.so \\
     \$(LOCAL_PATH)/proprietary/system/lib/libMali.so:system/lib/libMali.so \\