diff --git a/datachannel_js.go b/datachannel_js.go
index c6e040cf..4b56a0f3 100644
--- a/datachannel_js.go
+++ b/datachannel_js.go
@@ -67,7 +67,7 @@ func (d *DataChannel) OnMessage(f func(msg DataChannelMessage)) {
 		defer oldHandler.Release()
 	}
 	onMessageHandler := js.FuncOf(func(this js.Value, args []js.Value) interface{} {
-		// TODO: Ensure message order?
+		// pion/webrtc/projects/15
 		data := args[0].Get("data")
 		go func() {
 			// valueToDataChannelMessage may block when handling 'Blob' data
diff --git a/datachannel_js_detach.go b/datachannel_js_detach.go
index 7a84876d..dd0069e0 100644
--- a/datachannel_js_detach.go
+++ b/datachannel_js_detach.go
@@ -19,10 +19,10 @@ func newDetachedDataChannel(dc *DataChannel) *detachedDataChannel {
 
 	// Wire up callbacks
 	dc.OnMessage(func(msg DataChannelMessage) {
-		read <- msg // TODO: Potential leak?
+		read <- msg // pion/webrtc/projects/15
 	})
 
-	// TODO: OnClose?
+	// pion/webrtc/projects/15
 
 	return &detachedDataChannel{
 		dc:   dc,
diff --git a/peerconnection_js.go b/peerconnection_js.go
index 7af77449..e3ccc806 100644
--- a/peerconnection_js.go
+++ b/peerconnection_js.go
@@ -73,10 +73,11 @@ func (pc *PeerConnection) OnDataChannel(f func(*DataChannel)) {
 		defer oldHandler.Release()
 	}
 	onDataChannelHandler := js.FuncOf(func(this js.Value, args []js.Value) interface{} {
-		// BUG(albrow): This reference to the underlying DataChannel doesn't know
+		// pion/webrtc/projects/15
+		// This reference to the underlying DataChannel doesn't know
 		// about any other references to the same DataChannel. This might result in
-		// memory leaks where we don't clean up handler functions. Could possibly
-		// fix by keeping a mutex-protected list of all DataChannel references as a
+		// memory leaks where we don't clean up handler functions. Could possibly fix
+		// by keeping a mutex-protected list of all DataChannel references as a
 		// property of this PeerConnection, but at the cost of additional overhead.
 		dataChannel := &DataChannel{
 			underlying: args[0].Get("channel"),
@@ -124,7 +125,7 @@ func (pc *PeerConnection) checkConfiguration(configuration Configuration) error
 		}
 	}
 
-	// TODO: Enable these checks once Certificates are supported.
+	// https://github.com/pion/webrtc/issues/513
 	// https://www.w3.org/TR/webrtc/#set-the-configuration (step #4)
 	// if len(configuration.Certificates) > 0 {
 	// 	if len(configuration.Certificates) != len(existingConfiguration.Certificates) {
diff --git a/quictransport.go b/quictransport.go
index d41df7a2..edd2692b 100644
--- a/quictransport.go
+++ b/quictransport.go
@@ -125,7 +125,6 @@ func (t *QUICTransport) Start(remoteParameters QUICParameters) error {
 	}
 
 	// Check the fingerprint if a certificate was exchanged
-	// TODO: Check why never received.
 	remoteCerts := t.TransportBase.GetRemoteCertificates()
 	if len(remoteCerts) > 0 {
 		err := t.validateFingerPrint(remoteParameters, remoteCerts[0])
diff --git a/sctptransport.go b/sctptransport.go
index ffc7faa4..7b9508dc 100644
--- a/sctptransport.go
+++ b/sctptransport.go
@@ -236,8 +236,8 @@ func (r *SCTPTransport) updateMessageSize() {
 	r.lock.Lock()
 	defer r.lock.Unlock()
 
-	var remoteMaxMessageSize float64 = 65536 // TODO: get from SDP
-	var canSendSize float64 = 65536          // TODO: Get from SCTP implementation
+	var remoteMaxMessageSize float64 = 65536 // pion/webrtc#758
+	var canSendSize float64 = 65536          // pion/webrtc#758
 
 	r.maxMessageSize = r.calcMessageSize(remoteMaxMessageSize, canSendSize)
 }