diff --git a/plugin/module.cpp b/plugin/module.cpp
index eee33e1..5d308e1 100644
--- a/plugin/module.cpp
+++ b/plugin/module.cpp
@@ -34,8 +34,8 @@ void Module::run(Voice* voice) {
     r = decayTable[patchRam.env_r];   // release time coeff looked up in table
     s = patchRam.env_s << 7;          // scale 0x00-0x7f to 0x0000-0x3f80
 
-    square = (patchRam.switch2 & 0x08) ? 0.63 : 0;
-    saw = (patchRam.switch2 & 0x10) ? 0.8 : 0;
+    square = (patchRam.switch1 & 0x08) ? 0.63 : 0;
+    saw = (patchRam.switch1 & 0x10) ? 0.8 : 0;
     sub = patchRam.sub / 127.0f;
     lfoPhase += lfoRateTable[patchRam.lfoRate];
 
diff --git a/plugin/parameters.cpp b/plugin/parameters.cpp
index b800d9e..dc3aa63 100644
--- a/plugin/parameters.cpp
+++ b/plugin/parameters.cpp
@@ -178,7 +178,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
             parameter.symbol = "ch_vcfmode";
             parameter.ranges.min = 0.0f;
             parameter.ranges.max = 1.0f;
-            parameter.ranges.def = 1.0f;
+            parameter.ranges.def = 0.0f;
             parameter.midiCC = 21;
             parameter.enumValues.count = 2;
             parameter.enumValues.restrictedMode = true;
@@ -266,7 +266,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
             parameter.symbol = "ch_envgate";
             parameter.ranges.min = 0.0f;
             parameter.ranges.max = 1.0f;
-            parameter.ranges.def = 1.0f;
+            parameter.ranges.def = 0.0f;
             parameter.midiCC = 25;
             parameter.enumValues.count = 2;
             parameter.enumValues.restrictedMode = true;
diff --git a/plugin/peacock.cpp b/plugin/peacock.cpp
index cad3100..f97bced 100644
--- a/plugin/peacock.cpp
+++ b/plugin/peacock.cpp
@@ -20,7 +20,7 @@
 
 START_NAMESPACE_DISTRHO
 
-Peacock::Peacock() : Plugin(0, 0, 0) {
+Peacock::Peacock() : Plugin(parameterCount, 0, 0) {
     d_debug("peacock constructor\n");
     sampleRate = getSampleRate();
     m = new Module;
@@ -99,7 +99,7 @@ void Peacock::run(const float**, float** outputs, uint32_t frames, const MidiEve
     // we'd apply the highpass filter and chorus here
     // for now just copy left to right
     memcpy(outputs[1], outputs[0], sizeof(float) * frames);
-   // outputs[0][0]=1;
+    //outputs[0][0]=1;
 }
 
 Plugin* createPlugin() { return new Peacock(); }