diff --git a/rtl/genSaw.sv b/rtl/genSaw.sv
index 86aa130..dccec9d 100644
--- a/rtl/genSaw.sv
+++ b/rtl/genSaw.sv
@@ -42,7 +42,7 @@ logic [15:0] square;
 always_comb square = {~saw[15], {15{saw[15]}}}; // Square wave is MSB of saw
 
 logic [15:0] triangle;
-always_comb triangle = saw[15] ? {~saw[14:0], 1'b1} : {saw[14:0], 1'b0}; // Triangle wave calc
+always_comb triangle = saw[15] ? {saw[14], ~saw[13:0], 1'b1} : {~saw[14], saw[13:0], 1'b0}; // Triangle wave calc
 
 logic [15:0] sine;
 saw2sin m_saw2sin // Instantiate saw2sin module
@@ -55,8 +55,8 @@ always_comb // Select output waveform
   case (i_wave[1:0])
     2'd0: o_sample = saw;
     2'd1: o_sample = square;
-    2'd2: o_sample = {~triangle[15], triangle[14:0]};
-    2'd3: o_sample = {~sine[15], sine[14:0]};
+    2'd2: o_sample = triangle;
+    2'd3: o_sample = sine;
   endcase
 
 endmodule
diff --git a/rtl/saw2sin.sv b/rtl/saw2sin.sv
index db66ee9..3bd447e 100644
--- a/rtl/saw2sin.sv
+++ b/rtl/saw2sin.sv
@@ -30,6 +30,6 @@ always_ff @(posedge i_clk) sin <= reverse
   : (invert ? ~{1'b1, qsin[15:0]} + 17'd2  // Normal, Invert
             : {1'b1, qsin[15:0]} + 17'd0); // Normal, Normal
 
-always_comb o_sin = sin[16:1];
+always_comb o_sin = {~sin[16], sin[15:1]};
 
 endmodule
diff --git a/testSaw.py b/testSaw.py
index 43ec89d..dc51670 100644
--- a/testSaw.py
+++ b/testSaw.py
@@ -1,7 +1,6 @@
 from migen import *
 
 from litex.soc.interconnect.csr import *
-from litex.soc.interconnect.stream import AsyncFIFO
 from migen.genlib.fifo import AsyncFIFO as MigenAsyncFIFO
 from litex.soc.integration.doc import ModuleDoc