diff --git a/src/mpLinkCharacteristics.py b/src/mpLinkCharacteristics.py
index fe3d1e8..b57b1ac 100644
--- a/src/mpLinkCharacteristics.py
+++ b/src/mpLinkCharacteristics.py
@@ -10,9 +10,9 @@ class MpLinkCharacteristics:
 	
 	def asDict(self):
 		d = {}
-		d['delay'] = self.delay
-		d['queueSize'] = self.queueSize
-		d['bandwidth'] = self.bandwidth
+		d['bw'] = int(self.bandwidth)
+		d['delay'] = self.delay + "ms"
+		d['max_queue_size'] = int(self.queueSize)
 		return d
 
 	def __str__(self):
diff --git a/src/mpTopo.py b/src/mpTopo.py
index 7069379..0e454e9 100644
--- a/src/mpTopo.py
+++ b/src/mpTopo.py
@@ -22,7 +22,6 @@ class MpTopo:
 		return self.topoBuilder.addSwitch(switch)
 
 	def addLink(self, fromA, toB, **kwargs):
-		print(kwargs)
 		self.topoBuilder.addLink(fromA,toB,**kwargs)
 
 	def getCLI(self):