diff --git a/KernelModules.mk b/KernelModules.mk
index 8524cac..2054f5f 100644
--- a/KernelModules.mk
+++ b/KernelModules.mk
@@ -1,42 +1,42 @@
 # Kernel Modules TO BE COPIED
 PRODUCT_COPY_FILES += \
-    device/htc/click/custom/modules/2.6.29-Kalim/modules.dep:system/lib/modules/2.6.29-Kalim/modules.dep \
-    device/htc/click/custom/modules/2.6.29-Kalim/modules.usbmap:system/lib/modules/2.6.29-Kalim/modules.usbmap \
-    device/htc/click/custom/modules/2.6.29-Kalim/modules.devname:system/lib/modules/2.6.29-Kalim/modules.devname \
-    device/htc/click/custom/modules/2.6.29-Kalim/kernel/drivers/hid/hid-dummy.ko:system/lib/modules/2.6.29-Kalim/kernel/drivers/hid/hid-dummy.ko \
-    device/htc/click/custom/modules/2.6.29-Kalim/kernel/drivers/staging/ramzswap/ramzswap.ko:system/lib/modules/2.6.29-Kalim/kernel/drivers/staging/ramzswap/ramzswap.ko \
-    device/htc/click/custom/modules/2.6.29-Kalim/kernel/lib/crc16.ko:system/lib/modules/2.6.29-Kalim/kernel/lib/crc16.ko \
+    device/htc/click/custom/modules/2.6.29-Kalim/modules.alias.bin:system/lib/modules/2.6.29-Kalim/modules.alias.bin \
+    device/htc/click/custom/modules/2.6.29-Kalim/modules.symbols.bin:system/lib/modules/2.6.29-Kalim/modules.symbols.bin \
+    device/htc/click/custom/modules/2.6.29-Kalim/modules.dep.bin:system/lib/modules/2.6.29-Kalim/modules.dep.bin \
     device/htc/click/custom/modules/2.6.29-Kalim/kernel/fs/jbd2/jbd2.ko:system/lib/modules/2.6.29-Kalim/kernel/fs/jbd2/jbd2.ko \
     device/htc/click/custom/modules/2.6.29-Kalim/kernel/fs/ext4/ext4.ko:system/lib/modules/2.6.29-Kalim/kernel/fs/ext4/ext4.ko \
     device/htc/click/custom/modules/2.6.29-Kalim/kernel/crypto/deflate.ko:system/lib/modules/2.6.29-Kalim/kernel/crypto/deflate.ko \
-    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_tunnel.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_tunnel.ko \
-    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/mip6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/mip6.ko \
-    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ah6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/ah6.ko \
-    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ipv6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/ipv6.ko \
-    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/tunnel6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/tunnel6.ko \
-    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_beet.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_beet.ko \
-    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_ro.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_ro.ko \
-    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ip6_tunnel.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/ip6_tunnel.ko \
-    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_tunnel.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_tunnel.ko \
-    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ipcomp6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/ipcomp6.ko \
-    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/sit.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/sit.ko \
-    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_transport.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_transport.ko \
-    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/esp6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/esp6.ko \
-    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv4/tunnel4.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv4/tunnel4.ko \
+    device/htc/click/custom/modules/2.6.29-Kalim/kernel/lib/crc16.ko:system/lib/modules/2.6.29-Kalim/kernel/lib/crc16.ko \
+    device/htc/click/custom/modules/2.6.29-Kalim/kernel/drivers/hid/hid-dummy.ko:system/lib/modules/2.6.29-Kalim/kernel/drivers/hid/hid-dummy.ko \
+    device/htc/click/custom/modules/2.6.29-Kalim/kernel/drivers/staging/ramzswap/ramzswap.ko:system/lib/modules/2.6.29-Kalim/kernel/drivers/staging/ramzswap/ramzswap.ko \
     device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/xfrm/xfrm_ipcomp.ko:system/lib/modules/2.6.29-Kalim/kernel/net/xfrm/xfrm_ipcomp.ko \
+    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ipcomp6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/ipcomp6.ko \
+    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/esp6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/esp6.ko \
+    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/mip6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/mip6.ko \
+    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_transport.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_transport.ko \
+    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_tunnel.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_tunnel.ko \
+    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_beet.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_beet.ko \
+    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ipv6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/ipv6.ko \
+    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/sit.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/sit.ko \
+    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/tunnel6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/tunnel6.ko \
+    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_ro.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_ro.ko \
+    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_tunnel.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_tunnel.ko \
+    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ah6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/ah6.ko \
+    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ip6_tunnel.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/ip6_tunnel.ko \
+    device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv4/tunnel4.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv4/tunnel4.ko \
     device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/netfilter/xt_TCPMSS.ko:system/lib/modules/2.6.29-Kalim/kernel/net/netfilter/xt_TCPMSS.ko \
-    device/htc/click/custom/modules/2.6.29-Kalim/modules.order:system/lib/modules/2.6.29-Kalim/modules.order \
-    device/htc/click/custom/modules/2.6.29-Kalim/modules.inputmap:system/lib/modules/2.6.29-Kalim/modules.inputmap \
-    device/htc/click/custom/modules/2.6.29-Kalim/modules.ofmap:system/lib/modules/2.6.29-Kalim/modules.ofmap \
-    device/htc/click/custom/modules/2.6.29-Kalim/modules.pcimap:system/lib/modules/2.6.29-Kalim/modules.pcimap \
     device/htc/click/custom/modules/2.6.29-Kalim/modules.ccwmap:system/lib/modules/2.6.29-Kalim/modules.ccwmap \
     device/htc/click/custom/modules/2.6.29-Kalim/modules.seriomap:system/lib/modules/2.6.29-Kalim/modules.seriomap \
-    device/htc/click/custom/modules/2.6.29-Kalim/modules.symbols:system/lib/modules/2.6.29-Kalim/modules.symbols \
-    device/htc/click/custom/modules/2.6.29-Kalim/modules.ieee1394map:system/lib/modules/2.6.29-Kalim/modules.ieee1394map \
-    device/htc/click/custom/modules/2.6.29-Kalim/modules.softdep:system/lib/modules/2.6.29-Kalim/modules.softdep \
+    device/htc/click/custom/modules/2.6.29-Kalim/modules.pcimap:system/lib/modules/2.6.29-Kalim/modules.pcimap \
+    device/htc/click/custom/modules/2.6.29-Kalim/modules.ofmap:system/lib/modules/2.6.29-Kalim/modules.ofmap \
     device/htc/click/custom/modules/2.6.29-Kalim/modules.isapnpmap:system/lib/modules/2.6.29-Kalim/modules.isapnpmap \
-    device/htc/click/custom/modules/2.6.29-Kalim/modules.dep.bin:system/lib/modules/2.6.29-Kalim/modules.dep.bin \
-    device/htc/click/custom/modules/2.6.29-Kalim/modules.symbols.bin:system/lib/modules/2.6.29-Kalim/modules.symbols.bin \
-    device/htc/click/custom/modules/2.6.29-Kalim/modules.alias.bin:system/lib/modules/2.6.29-Kalim/modules.alias.bin \
+    device/htc/click/custom/modules/2.6.29-Kalim/modules.dep:system/lib/modules/2.6.29-Kalim/modules.dep \
+    device/htc/click/custom/modules/2.6.29-Kalim/modules.inputmap:system/lib/modules/2.6.29-Kalim/modules.inputmap \
+    device/htc/click/custom/modules/2.6.29-Kalim/modules.softdep:system/lib/modules/2.6.29-Kalim/modules.softdep \
+    device/htc/click/custom/modules/2.6.29-Kalim/modules.ieee1394map:system/lib/modules/2.6.29-Kalim/modules.ieee1394map \
     device/htc/click/custom/modules/2.6.29-Kalim/modules.alias:system/lib/modules/2.6.29-Kalim/modules.alias \
+    device/htc/click/custom/modules/2.6.29-Kalim/modules.symbols:system/lib/modules/2.6.29-Kalim/modules.symbols \
+    device/htc/click/custom/modules/2.6.29-Kalim/modules.usbmap:system/lib/modules/2.6.29-Kalim/modules.usbmap \
+    device/htc/click/custom/modules/2.6.29-Kalim/modules.devname:system/lib/modules/2.6.29-Kalim/modules.devname \
+    device/htc/click/custom/modules/2.6.29-Kalim/modules.order:system/lib/modules/2.6.29-Kalim/modules.order \
     device/htc/click/custom/modules/wlan.ko:system/lib/modules/wlan.ko
diff --git a/click-vendor-blobs.mk b/click-vendor-blobs.mk
index a58de65..8df3b69 100644
--- a/click-vendor-blobs.mk
+++ b/click-vendor-blobs.mk
@@ -39,7 +39,6 @@ PRODUCT_COPY_FILES += \
     device/htc/click/proprietary/libaudioeq.so:system/lib/libaudioeq.so \
     device/htc/click/proprietary/libqcamera.so:system/lib/libqcamera.so \
     device/htc/click/proprietary/libmm-adspsvc.so:system/lib/libmm-adspsvc.so \
-    device/htc/click/proprietary/libGLES_qcom.so:system/lib/egl/libGLES_qcom.so \
     device/htc/click/proprietary/libOmxH264Dec.so:system/lib/libOmxH264Dec.so \
     device/htc/click/proprietary/libOmxMpeg4Dec.so:system/lib/libOmxMpeg4Dec.so \
     device/htc/click/proprietary/libOmxVidEnc.so:system/lib/libOmxVidEnc.so \
diff --git a/click.mk b/click.mk
index e3e972c..f55c046 100644
--- a/click.mk
+++ b/click.mk
@@ -114,8 +114,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.com.google.locationfeatures=1
 
 PRODUCT_PROPERTY_OVERRIDES += \
-    debug.sf.hw=1 \
-    ro.opengles.version=65537 \
+    ro.opengles.version=65536 \
     persist.sys.use_dithering=0
 
 # Disable fs check on boot by default
diff --git a/init.bahamas.rc b/init.bahamas.rc
index f9259e3..642968d 100644
--- a/init.bahamas.rc
+++ b/init.bahamas.rc
@@ -49,6 +49,9 @@ on boot
     write /sys/block/mtdblock4/bdi/read_ahead_kb 4
     write /sys/block/mtdblock5/bdi/read_ahead_kb 4
 
+    # CPU_Scaling Governor make permissions
+    chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+
 # compass/accelerometer daemon
 service akm8973 /system/bin/akm8973
     user compass