diff --git a/Dockerfile b/Dockerfile
index 914094e..3f03461 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
-FROM alpine:latest
+FROM alpine:3.6
 RUN apk update && apk add ca-certificates && update-ca-certificates && apk add openssl
-RUN wget https://github.com/buger/goreplay/releases/download/v0.16.0.2/gor_0.16.0_x64.tar.gz -O gor.tar.gz
+RUN wget https://github.com/buger/goreplay/releases/download/v0.16.1/gor_0.16.1_x64.tar.gz -O gor.tar.gz
 RUN tar xzf gor.tar.gz
-ENTRYPOINT ./gor
+ENTRYPOINT ["./goreplay"]
\ No newline at end of file
diff --git a/README.md b/README.md
index 0b09462..8cd1283 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ We have created a [GoReplay PRO](https://goreplay.org/pro.html) extension which
 ## Problems?
 If you have a problem, please review the [FAQ](https://github.com/buger/goreplay/wiki/FAQ) and [Troubleshooting](https://github.com/buger/goreplay/wiki/Troubleshooting) wiki pages. Searching the [issues](https://github.com/buger/goreplay/issues) for your problem is also a good idea.
 
-All bug-reports and suggestions should go though Github Issues or our [Google Group](https://groups.google.com/forum/#!forum/gor-users) (you can just send email to gor-users@googlegroups.com).
+All bug-reports and suggestions should go through Github Issues or our [Google Group](https://groups.google.com/forum/#!forum/gor-users) (you can just send email to gor-users@googlegroups.com).
 If you have a private question feel free to send email to support@gortool.com.
 
 
diff --git a/raw_socket_listener/tcp_message.go b/raw_socket_listener/tcp_message.go
index 86bc8b0..839a47a 100644
--- a/raw_socket_listener/tcp_message.go
+++ b/raw_socket_listener/tcp_message.go
@@ -49,7 +49,8 @@ type TCPMessage struct {
 	complete      bool
 }
 
-// NewTCPMessage pointer created from a Acknowledgment number and a channel of messages readuy to be deleted
+// NewTCPMessage pointer created from a sequence and acknowledgment numbers, whether the message is incoming and a timestamp
+// that indicates when the packet was captrued.
 func NewTCPMessage(Seq, Ack uint32, IsIncoming bool, timestamp time.Time) (msg *TCPMessage) {
 	msg = &TCPMessage{Seq: Seq, Ack: Ack, IsIncoming: IsIncoming, Start: timestamp}
 
@@ -74,7 +75,7 @@ func (t *TCPMessage) Bytes() (output []byte) {
 	return output
 }
 
-// Size returns total body size
+// BodySize returns total body size
 func (t *TCPMessage) BodySize() (size int) {
 	if len(t.packets) == 0 || t.headerPacket == -1 {
 		return 0
@@ -225,7 +226,7 @@ func (t *TCPMessage) updateHeadersPacket() {
 	return
 }
 
-// isMultipart returns true if message contains from multiple tcp packets
+// checkIfComplete returns true if all of the packets that compse the message arrived. 
 func (t *TCPMessage) checkIfComplete() {
 	if t.seqMissing || t.headerPacket == -1 {
 		return