diff --git a/conf/airframes/Poine/funjet42.xml b/conf/airframes/Poine/funjet42.xml
index 581000ebda..3d447e0a12 100644
--- a/conf/airframes/Poine/funjet42.xml
+++ b/conf/airframes/Poine/funjet42.xml
@@ -20,6 +20,29 @@
     <subsystem name="navigation"/>
   </firmware>
 
+  <firmware name="lisa_l_test_progs">
+    <target name="test_led"   board="lisa_l_1.0"/>
+    <target name="test_uart"   board="lisa_l_1.0"/>
+    <target name="test_servos"   board="lisa_l_1.0"/>
+    <target name="test_telemetry"   board="lisa_l_1.0"/>
+    <target name="test_baro"        board="lisa_l_1.0"/>
+    <target name="test_imu_b2"      board="lisa_l_1.0"/>
+    <target name="test_imu_b2_2"    board="lisa_l_1.0"/>
+    <target name="test_imu_aspirin" board="lisa_l_1.0"/>
+    <target name="test_rc_spektrum" board="lisa_l_1.0"/>
+    <target name="test_rc_ppm"      board="lisa_l_1.0"/>
+    <target name="test_adc"         board="lisa_l_1.0"/>
+    <target name="test_hmc5843"     board="lisa_l_1.0"/>
+    <target name="test_itg3200"     board="lisa_l_1.0"/>
+    <target name="test_adxl345"             board="lisa_l_1.0"/>
+    <target name="test_esc_mkk_simple"      board="lisa_l_1.0"/>
+    <target name="test_esc_asctecv1_simple" board="lisa_l_1.0"/>
+    <target name="test_actuators_mkk"       board="lisa_l_1.0"/>
+    <target name="test_actuators_asctecv1"  board="lisa_l_1.0"/>
+  </firmware>
+
+
+
   <servos>
     <servo name="MOTOR"         no="0" min="1000" neutral="1000" max="2000"/>
     <servo name="AILEVON_LEFT"  no="1" min="1900" neutral="1521" max="1100"/>
diff --git a/conf/airframes/mm/fixed-wing/slowfast.xml b/conf/airframes/mm/fixed-wing/slowfast.xml
index 8ac62358d8..4109d14975 100644
--- a/conf/airframes/mm/fixed-wing/slowfast.xml
+++ b/conf/airframes/mm/fixed-wing/slowfast.xml
@@ -196,6 +196,8 @@
     <define name="DEVICE_ADDRESS" value="...."/>
   </section>
 
+
+<!--
  <makefile>
 CONFIG = \"tiny_2_1.h\"
 
@@ -251,4 +253,18 @@ sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN
 sim.srcs += nav_line.c nav_survey_rectangle.c
 
   </makefile>
+-->
+
+  <firmware name="fixedwing">
+    <target name="sim" 			board="pc"/>
+    <target name="ap" 			board="tiny_2.1"/>
+
+    <subsystem name="radio_control"     type="ppm"/>
+    <subsystem name="telemetry" 	type="xbee_api"/>
+    <subsystem name="control"/>
+    <subsystem name="attitude" 		type="infrared"/>
+    <subsystem name="gps" 		type="ublox_lea5h"/>
+    <subsystem name="navigation"/>
+  </firmware>
+
 </airframe>
diff --git a/conf/airframes/mm/fixed-wing/slowfast2.xml b/conf/airframes/mm/fixed-wing/slowfast2.xml
index 52d7bab7bd..ab3381e4f9 100644
--- a/conf/airframes/mm/fixed-wing/slowfast2.xml
+++ b/conf/airframes/mm/fixed-wing/slowfast2.xml
@@ -196,6 +196,7 @@
     <define name="DEVICE_ADDRESS" value="...."/>
   </section>
 
+<!--
  <makefile>
 CONFIG = \"tiny_2_1.h\"
 
@@ -251,4 +252,18 @@ sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN
 sim.srcs += nav_line.c nav_survey_rectangle.c
 
   </makefile>
+-->
+  <firmware name="fixedwing">
+    <target name="sim" 			board="pc"/>
+    <target name="ap" 			board="tiny_2.1"/>
+
+    <subsystem name="radio_control"     type="ppm"/>
+    <subsystem name="telemetry" 	type="xbee_api"/>
+    <subsystem name="control"/>
+    <subsystem name="attitude" 		type="infrared"/>
+    <subsystem name="gps" 		type="ublox_lea5h"/>
+    <subsystem name="navigation"/>
+  </firmware>
+
+
 </airframe>
diff --git a/conf/settings/tuning.xml b/conf/settings/tuning.xml
index 923aa3181c..70f9ed3ff0 100644
--- a/conf/settings/tuning.xml
+++ b/conf/settings/tuning.xml
@@ -75,8 +75,9 @@
         <dl_setting MAX="0.00" MIN="-0.05" STEP="0.005" VAR="v_ctl_auto_throttle_pgain" shortname="throttle_pgain" param="V_CTL_AUTO_THROTTLE_PGAIN"/>
         <dl_setting MAX="1" MIN="0.0" STEP="0.05" VAR="v_ctl_auto_throttle_igain" shortname="throttle_igain" param="V_CTL_AUTO_THROTTLE_IGAIN"/>
         <dl_setting MAX="2" MIN="0.0" STEP="0.1" VAR="v_ctl_auto_throttle_dgain" shortname="throttle_dgain"/>
-        <dl_setting MAX="0" MIN="-4000" STEP="100" VAR="v_ctl_auto_throttle_dash_trim" shortname="dash trim"/>
-        <dl_setting MIN="0" MAX="3000" STEP="100" VAR="v_ctl_auto_throttle_loiter_trim" shortname="loiter trim" param="V_CTL_AUTO_THROTTLE_LOITER_TRIM"/>
+<!-- commented by poine - does anybody use that ?at all ? -->
+<!--        <dl_setting MAX="0" MIN="-4000" STEP="100" VAR="v_ctl_auto_throttle_dash_trim" shortname="dash trim"/> -->
+<!--        <dl_setting MIN="0" MAX="3000" STEP="100" VAR="v_ctl_auto_throttle_loiter_trim" shortname="loiter trim" param="V_CTL_AUTO_THROTTLE_LOITER_TRIM"/> -->
         <dl_setting MAX="1" MIN="0" STEP="0.01" VAR="v_ctl_auto_throttle_climb_throttle_increment" shortname="throttle_incr" param="V_CTL_AUTO_THROTTLE_CLIMB_THROTTLE_INCREMENT"/>
         <dl_setting MAX="1" MIN="0" STEP="0.01" VAR="v_ctl_auto_throttle_pitch_of_vz_pgain" shortname="pitch_of_vz" param="V_CTL_AUTO_THROTTLE_PITCH_OF_VZ_PGAIN"/>
         <dl_setting MAX="10" MIN="-10" STEP="0.1" VAR="v_ctl_auto_throttle_pitch_of_vz_dgain" shortname="pitch_of_vz (d)"/>
diff --git a/sw/airborne/firmwares/fixedwing/main_ap.c b/sw/airborne/firmwares/fixedwing/main_ap.c
index ead20fd7e4..1be686d73f 100644
--- a/sw/airborne/firmwares/fixedwing/main_ap.c
+++ b/sw/airborne/firmwares/fixedwing/main_ap.c
@@ -53,11 +53,8 @@
 #include "flight_plan.h"
 #include "datalink.h"
 #include "xbee.h"
-#ifdef STM32
-#include <stm32/gpio.h>
-#else
+
 #include "gpio.h"
-#endif
 
 #if defined RADIO_CONTROL || defined RADIO_CONTROL_AUTO1
 #include "rc_settings.h"
@@ -554,9 +551,7 @@ void init_ap( void ) {
   int_enable();
 
   /** wait 0.5s (historical :-) */
-#ifndef STM32
   sys_time_usleep(500000);
-#endif
 
 #if defined GPS_CONFIGURE
   gps_configure_uart();