diff --git a/BoardConfig.mk b/BoardConfig.mk
index f0801e9..2990488 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -33,11 +33,12 @@ TARGET_PREBUILT_KERNEL := device/htc/click/custom/kernel
 # Wifi related defines
 BOARD_WPA_SUPPLICANT_DRIVER := CUSTOM
 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := libWifiApi
+BOARD_WLAN_DEVICE           := wl1251
 BOARD_WLAN_TI_STA_DK_ROOT   := system/wlan/ti/sta_dk_4_0_4_32
-WIFI_DRIVER_MODULE_PATH     := "/system/lib/modules/wlan.ko"
+WIFI_DRIVER_MODULE_PATH     := /system/lib/modules/wlan.ko
 WIFI_DRIVER_MODULE_ARG      := ""
-WIFI_DRIVER_MODULE_NAME     := "wlan"
-WIFI_FIRMWARE_LOADER        := "wlan_loader"
+WIFI_DRIVER_MODULE_NAME     := wlan
+WIFI_FIRMWARE_LOADER        := wlan_loader
 
 TARGET_PROVIDES_INIT_RC := false
 
@@ -51,11 +52,10 @@ BOARD_USES_GENERIC_AUDIO := false
 
 BOARD_USE_USB_MASS_STORAGE_SWITCH := true
 
-# libsurfaceflinger to avoid Draw Texture Extension
-BOARD_AVOID_DRAW_TEXTURE_EXTENSION := true
-
 BOARD_HAVE_BLUETOOTH := true
 
+BOARD_AVOID_DRAW_TEXTURE_EXTENSION := true
+
 BOARD_VENDOR_USE_AKMD := akm8973
 
 BOARD_VENDOR_QCOM_AMSS_VERSION := 1355
@@ -71,6 +71,9 @@ BOARD_EGL_CFG := device/htc/click/custom/egl.cfg
 # No authoring clock for OpenCore
 # BOARD_NO_PV_AUTHORING_CLOCK := true
 
+BOARD_HAVE_FM_RADIO := true
+BOARD_GLOBAL_CFLAGS += -DHAVE_FM_RADIO
+
 BOARD_USES_QCOM_LIBS := true
 
 BOARD_USES_GPSSHIM := true
@@ -81,6 +84,7 @@ TARGET_LIBAGL_USE_GRALLOC_COPYBITS := true
 
 BOARD_NO_RGBX_8888 := true
 
+WITH_DEXPREOPT := true
 JS_ENGINE := v8
 
 TARGET_RELEASETOOLS_EXTENSIONS := device/htc/common
diff --git a/click.mk b/click.mk
index ecafddb..e98674e 100644
--- a/click.mk
+++ b/click.mk
@@ -31,12 +31,27 @@ PRODUCT_PACKAGES += \
     libOmxCore \
     libmm-omxcore \
     libOmxVidEnc \
-    wlan_loader \
-    tiwlan.ini \
     libcamera \
     librpc \
     dhcpcd.conf
 
+#WiFi stuff
+PRODUCT_PACKAGES += \
+    wpa_supplicant.conf \
+    tiwlan.ini \
+    dhcpcd.conf \
+    wlan_cu \
+    wlan_loader \
+    libCustomWifi
+
+#HotSpot
+PRODUCT_PACKAGES += \
+    tiap_loader \
+    tiap_cu \
+    tiwlan_ap.ini \
+    hostap \
+    hostapd.conf
+
 # Add Gallery 3D / Normal
 PRODUCT_PACKAGES += Gallery
 
@@ -65,7 +80,6 @@ PRODUCT_COPY_FILES += \
 
 # extra etc config files
 PRODUCT_COPY_FILES += \
-    device/htc/click/custom/10calibrate_screen:system/etc/init.d/10calibrate_screen \
     device/htc/click/custom/sysctl.conf:system/etc/sysctl.conf
 
 # precompiled files for /system/bin
diff --git a/custom/10calibrate_screen b/custom/10calibrate_screen
deleted file mode 100755
index e0cc6a8..0000000
--- a/custom/10calibrate_screen
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/system/bin/sh
-
-SETTINGSDB=/data/data/com.android.providers.settings/databases/settings.db
-if [ ! -f $SETTINGSDB ] ;
-then
-  exit
-fi
-
-CALIBRATION=`sqlite3 $SETTINGSDB "select value from system where name='calibration_points';"`
-if [ ! -z $CALIBRATION ] ;
-then
-  echo ">>> Calibrating touch screen with calibration points: " $CALIBRATION
-  echo $CALIBRATION > /sys/class/input/input1/calibration_points
-fi
-