diff --git a/platformio.ini b/platformio.ini
index 4fd07e3..4a04cbc 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -18,7 +18,8 @@ lib_deps =
 #    -cavrisp2
 #    -cdragon_isp
 #  -cavrispmkII
-upload_command = avrdude -vv -b57600 -pm328p -c avrisp -Pcom10 $UPLOAD_FLAGS -U flash:w:$SOURCE:i
+
+upload_command = avrdude -vv -b57600 -pm328p -c avrisp -Pcom9 $UPLOAD_FLAGS -U flash:w:$SOURCE:i
 
 # upload_protocol=custom
 # upload_speed=115200
@@ -39,8 +40,8 @@ upload_command = avrdude -vv -b57600 -pm328p -c avrisp -Pcom10 $UPLOAD_FLAGS -U
   platform=native
   build_type = release
   test_ignore = cross/*
-  build_flags = -DNATIVE
-  debug_test = noarch/test_gun
+  build_flags = -DNATIVE -O0
+  debug_test = noarch/test_contactor
   build_src_filter = ${env.src_filter} -<TargetApp.cpp> -<GunApp.cpp>
 
 [env:native_debug]
@@ -48,9 +49,9 @@ upload_command = avrdude -vv -b57600 -pm328p -c avrisp -Pcom10 $UPLOAD_FLAGS -U
     fakeit=https://github.com/FabioBatSilva/ArduinoFake.git
   platform=native
   build_type = debug
-  debug_build_flags = -Og -ggdb3 -g3 -DNATIVE -UAVR
+  debug_build_flags = -Og -ggdb3 -g3 -DNATIVE
   test_ignore = cross/*
-  debug_test = noarch/test_gun
+  debug_test = native/test_gun
   build_src_filter = ${env.src_filter} -<TargetApp.cpp> -<GunApp.cpp>
 
 [env:cross]
@@ -87,8 +88,8 @@ upload_command = avrdude -vv -b57600 -pm328p -c avrisp -Pcom10 $UPLOAD_FLAGS -U
   platform = atmelavr
   board = ATmega328P
   build_type = release
-  build_flags = -DAVR
+  build_flags = -DAVR -O2
   test_ignore = 
     native/*
     noarch/*
-  build_src_filter = ${env.src_filter} -<TargetApp.cpp> -<ConsoleTargets.cpp>
\ No newline at end of file
+  build_src_filter = ${env.src_filter} -<TargetApp.cpp> -<ConsoleTargets.cpp>