diff --git a/main.py b/main.py
index 36eebae..d307470 100755
--- a/main.py
+++ b/main.py
@@ -3,12 +3,11 @@
 import numpy as np
 import matplotlib.pyplot as plt
 
-from channel import channel_sim
+import channel
+import qam
 
 from serpar import parallelise, serialise
 
-import qam
-
 def cyclic_prefix(n, in_data, prefix_len):
     out_data = np.ndarray((len(in_data), n + prefix_len), dtype=np.csingle)
 
@@ -22,11 +21,11 @@ if __name__ == '__main__':
 
     parallel = parallelise(16, bytes)
 
-    modulated = qam(16, parallel)
+    modulated = qam.modulate(parallel)
 
     tx = np.fft.ifft(modulated)
 
-    rx = channel_sim(tx)
+    rx = channel.sim(tx)
     
 
 
diff --git a/qam.py b/qam.py
index 879e905..47a51dd 100644
--- a/qam.py
+++ b/qam.py
@@ -1,5 +1,5 @@
 import numpy as np
-from scipy.spatial.distances import euclidean
+from scipy.spatial.distance import euclidean
 
 qam_mapping_table = {
     0 : 1 + 1j,
@@ -8,7 +8,7 @@ qam_mapping_table = {
     3 : 1 - 1j
 }
 
-def qam_demapping_table = { x, y for y, x in qam_mapping_table.items() }
+qam_demapping_table = { x : y for y, x in qam_mapping_table.items() }
 
 def modulate(in_data):
     """