diff --git a/BoardConfig.mk b/BoardConfig.mk
index 81b3b5d..bea7fa2 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -73,17 +73,17 @@ BOARD_MKBOOTIMG_INIT_ARGS += --header_version $(BOARD_INIT_BOOT_HEADER_VERSION)
 
 # Kernel
 BOARD_KERNEL_CMDLINE := \
-    ignore_loglevel \
+    # ignore_loglevel \
     debug \
     androidboot.hardware=qcom \
     androidboot.memcg=1 \
     androidboot.usbcontroller=a600000.dwc3 \
-    androidboot.load_modules_parallel=false \
-    androidboot.hypervisor.protected_vm.supported=true \
+    # androidboot.load_modules_parallel=false \
+    # androidboot.hypervisor.protected_vm.supported=true \
     androidboot.selinux=permissive \
-    aosp_is_booting \
+    # aosp_is_booting \
     firmware_class.path=/vendor/firmware_mnt/image \
-    loop.max_part=7 \
+    # loop.max_part=7 \
     printk.devkmsg=on \
     video=vfb:640x400,bpp=32,memsize=3072000 \
     audit=0
diff --git a/device.mk b/device.mk
index 0d947a8..a9547d7 100644
--- a/device.mk
+++ b/device.mk
@@ -26,6 +26,15 @@ PRODUCT_AAPT_PREF_CONFIG := xxxhdpi
 BOARD_SHIPPING_API_LEVEL := 34
 PRODUCT_SHIPPING_API_LEVEL := $(BOARD_SHIPPING_API_LEVEL)
 
+ifeq ($(TARGET_BUILD_VARIANT),eng)
+    PRODUCT_SOONG_DEXPREOPT_ENABLED := true
+    PRODUCT_SOONG_CONFIG_OVERRIDES += \
+        dex_preopt_enabled=true
+    DISABLE_DEXPREOPT := false
+    PRODUCT_DEX_PREOPT := true
+    PRODUCT_ART_BOOT_JARS_PREOPT := true
+endif
+
 # No A/B
 AB_OTA_UPDATER := false
 
@@ -56,7 +65,8 @@ PRODUCT_PACKAGES += \
     libsndcardparser \
     libtinycompress \
     libvolumelistener \
-    sound_trigger.primary.pineapple
+    sound_trigger.primary.pineapple \
+    bootctrl_hal_defaults
 
 AUDIO_HAL_DIR := hardware/qcom-caf/sm8650/audio/primary-hal
 AUDIO_PAL_DIR := hardware/qcom-caf/sm8650/audio/pal
@@ -83,6 +93,11 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \
     frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml
 
+# Boot
+PRODUCT_PACKAGES += \
+    android.hardware.boot-service.qti \
+    android.hardware.boot-service.qti.recovery
+
 # Boot animation
 TARGET_SCREEN_HEIGHT := 3120
 TARGET_SCREEN_WIDTH := 1440
@@ -321,8 +336,8 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepdetector.xml
 
 # Shim
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/rootdir/system/bin/app_process32:system/bin/app_process32
+# PRODUCT_COPY_FILES += \
+#     $(LOCAL_PATH)/rootdir/system/bin/app_process32:system/bin/app_process32
 
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
diff --git a/rootdir/etc/init.e3q.rc b/rootdir/etc/init.e3q.rc
index ed2bac3..6f9913d 100644
--- a/rootdir/etc/init.e3q.rc
+++ b/rootdir/etc/init.e3q.rc
@@ -79,7 +79,7 @@ on late-fs
 on post-fs-data
 #mAFPC
     mkdir /efs/afc 0760 system system
-    #exec - system system -- /system/bin/mafpc_write
+    exec - system system -- /system/bin/mafpc_write
 
 on boot
     write /proc/sys/vm/swappiness 100
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 31031f9..7a078de 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -103,19 +103,6 @@ on init
     chmod 0660 /sys/fs/cgroup/memory/bg/tasks
 
 on post-fs
-    # → Symlinks für Audio Hal (echte Dateien existieren unter anderem Namen)
-    symlink /vendor/bin/hw/android.hardware.audio.service \
-            /vendor/bin/hw/android.hardware.audio@4.0-service
-    symlink /vendor/bin/hw/android.hardware.audio.service \
-            /vendor/bin/hw/android.hardware.audio-hal
-    symlink /vendor/bin/hw/android.hardware.audio.service \
-            /vendor/bin/hw/android.hardware.audio-hal-aidl
-    symlink /vendor/bin/hw/android.hardware.audio.service \
-            /vendor/bin/hw/android.hardware.audio-effect-hal-aidl
-    symlink /vendor/bin/hw/android.hardware.audio.service \
-            /vendor/bin/hw/android.hardware.audio-hal-4-0-msd
-    symlink /vendor/bin/hw/audio_proxy_service \
-            /vendor/bin/audio_proxy_service
 
 on early-boot
     # set RLIMIT_MEMLOCK to 64KB
diff --git a/system_ext.prop b/system_ext.prop
index eee0dbf..04924fa 100644
--- a/system_ext.prop
+++ b/system_ext.prop
@@ -1,3 +1,9 @@
 # DPM
 persist.vendor.dpm.feature=11
 
+# ADB-Debugging
+ro.secure=0
+ro.adb.secure=0
+ro.debuggable=1
+persist.sys.usb.config=adb
+persist.service.adb.enable=1