diff --git a/src/liowebrtc.js b/src/liowebrtc.js
index e27620747753da09415a4a5def3d713dd1952d8a..6555da3fa09a4e24c862ffdc3b6fd02bb0ef379e 100644
--- a/src/liowebrtc.js
+++ b/src/liowebrtc.js
@@ -55,9 +55,10 @@ class LioWebRTC extends WildEmitter {
     });
 
     if (options.dataOnly) {
-      console.log('data only');
       this.config.media.video = false;
       this.config.media.audio = false;
+      this.config.receiveMedia.offerToReceiveAudio = false;
+      this.config.receiveMedia.offerToReceiveVideo = false;
     }
 
       // attach detected support for convenience
diff --git a/src/peer.js b/src/peer.js
index 1930db824851179bed7810dba25e33a2ef42ea39..b2ed68c2876c5d2ecceec7157279c1a852290fdd 100644
--- a/src/peer.js
+++ b/src/peer.js
@@ -16,13 +16,10 @@ function isAllTracksEnded(stream) {
   return isAllTracksEnded;
 }
 
-class Peer {
+class Peer extends WildEmitter{
   constructor(options) {
+    super();
     const self = this;
-
-      // call emitter constructor
-    WildEmitter.call(this);
-
     this.id = options.id;
     this.parent = options.parent;
     this.type = options.type || 'video';
diff --git a/src/webrtc.js b/src/webrtc.js
index 970339a90d27ceafce4ff1810333f0f1b5d115a6..765f8dc11395d5e5459c6eb6915a9436f2e7f12f 100644
--- a/src/webrtc.js
+++ b/src/webrtc.js
@@ -143,7 +143,7 @@ class WebRTC extends LocalMedia {
   }
 
   shout(messageLabel, payload) {
-    sendDirectlyToAll(messageLabel, payload, 'liowebrtc');
+    this.sendDirectlyToAll(messageLabel, payload, 'liowebrtc');
   }
 
   whisper(peer, messageLabel, payload) {