diff --git a/UI.hpp b/UI.hpp
index 51ba966..1c03ec3 100644
--- a/UI.hpp
+++ b/UI.hpp
@@ -2069,7 +2069,7 @@ void UI_func_panorama(uint8_t param)
     if (configuration.sys.mono == 0)
     {
       lcd_display_meter_float("Panorama", configuration.dexed[selected_instance_id].pan, 0.05, -20.0, PANORAMA_MIN, PANORAMA_MAX, 1, 1, false, true, false);
-      mono2stereo[selected_instance_id]->panorama(mapfloat(configuration.dexed[selected_instance_id].pan, PANORAMA_MIN, PANORAMA_MAX, -1.0, 1.0));
+      mono2stereo[selected_instance_id]->panorama(mapfloat(configuration.dexed[selected_instance_id].pan, PANORAMA_MIN, PANORAMA_MAX, 1.0, -1.0));
     }
   }
 
@@ -2220,7 +2220,7 @@ void UI_func_polyphony(uint8_t param)
 #if NUM_DEXED>1
     lcd_display_bar_int("Polyphony", configuration.dexed[selected_instance_id].polyphony, 1.0, POLYPHONY_MIN, POLYPHONY_MAX - configuration.dexed[(selected_instance_id + 1) % NUM_DEXED].polyphony, 2, false, false, true);
 #else
-    lcd_display_bar_int("Polyphony", configuration.dexed[selected_instance_id].polyphony, 1.0, POLYPHONY_MIN, POLYPHONY_MAX].polyphony, 2, false, false, true);
+    lcd_display_bar_int("Polyphony", configuration.dexed[selected_instance_id].polyphony, 1.0, POLYPHONY_MIN, POLYPHONY_MAX, 2, false, false, true);
 #endif
     lcd_active_instance_number(selected_instance_id);
     UI_update_instance_icons();
diff --git a/config.h b/config.h
index 89f4c23..4dd021e 100644
--- a/config.h
+++ b/config.h
@@ -32,6 +32,7 @@
 
 // ATTENTION! For better latency you have to redefine AUDIO_BLOCK_SAMPLES from
 // 128 to 64 in <ARDUINO-IDE-DIR>/cores/teensy3/AudioStream.h
+// For this you haveto DOUBLE the audio buffers (AUDIO_MEM) manually!
 
 // If you want to test the system with Linux and without any keyboard and/or audio equipment, you can do the following:
 // 1. In Arduino-IDE enable "Tools->USB-Type->Serial + MIDI + Audio"
@@ -127,14 +128,9 @@
 //* AUDIO SOFTWARE SETTINGS
 //*************************************************************************************************
 #define SAMPLE_RATE 44100
+#define AUDIO_MEM 32
 
-#ifndef TEENSY_AUDIO_BOARD
-#if AUDIO_BLOCK_SAMPLES == 64
-#define AUDIO_MEM 400
-#else
-#define AUDIO_MEM 256
-#endif
-#else // IF TEENSY_AUDIO_BOARD
+#ifdef TEENSY_AUDIO_BOARD
 /*
   13: 3.16 Volts p-p
   14: 2.98 Volts p-p
@@ -159,12 +155,6 @@
 #define SGTL5000_LINEOUT_LEVEL 29
 #endif
 
-#if AUDIO_BLOCK_SAMPLES == 64
-#define AUDIO_MEM 400
-#else
-#define AUDIO_MEM 256
-#endif
-
 #if NUM_DEXED > 1
 #if defined(TEENSY3_6)
 #define DELAY_MAX_TIME 250