diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8743e28..e8aeea3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,19 +1,29 @@
-## Tag v0.2.0 (2016-12-25)
+##### Tag v0.2.1 (2016-12-31)
+
+- Remove misleading comments - #3
+- Add badges and make headings smaller - #4
+- Bump up Nginx to v1.11.8 - #5
+
+##### Tag v0.2.0 (2016-12-25)
+[![](https://images.microbadger.com/badges/image/janus1990/docker-nginx-php:v0.2.0.svg)](https://microbadger.com/images/janus1990/docker-nginx-php:v0.2.0 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/janus1990/docker-nginx-php:v0.2.0.svg)](https://microbadger.com/images/janus1990/docker-nginx-php:v0.2.0 "Get your own version badge on microbadger.com")
 
 - Upgrade to PHP v7.1.0
 - Add badges to README.md (powered by microbadger.com).
 
-## TAG v0.1.2 (2016-19-12)
+##### TAG v0.1.2 (2016-19-12)
+[![](https://images.microbadger.com/badges/image/janus1990/docker-nginx-php:v0.1.2.svg)](https://microbadger.com/images/janus1990/docker-nginx-php:v0.1.2 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/janus1990/docker-nginx-php:v0.1.2.svg)](https://microbadger.com/images/janus1990/docker-nginx-php:v0.1.2 "Get your own version badge on microbadger.com")
+
 
 - Fix PHP composer installer.
 
-## TAG v0.1.1 (2016-18-12)
+##### TAG v0.1.1 (2016-18-12)
 
 - Update Nginx to v1.11.7.
 - Update PHP to v7.0.14.
 - Fix permission on mounted volumes (see commit `9568fc3`).
 
-## TAG v0.1.0 (2016-12-16)
+##### TAG v0.1.0 (2016-12-16)
+[![](https://images.microbadger.com/badges/image/janus1990/docker-nginx-php:v0.1.0.svg)](https://microbadger.com/images/janus1990/docker-nginx-php:v0.1.0 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/janus1990/docker-nginx-php:v0.1.0.svg)](https://microbadger.com/images/janus1990/docker-nginx-php:v0.1.0 "Get your own version badge on microbadger.com")
 
 Initial release
 - Compile Nginx v1.11.6 from source.
@@ -21,7 +31,8 @@ Initial release
 - Install most recent version of PHP composer (as of 2016-12-01 v1.2.2).
 - Install Honcho for process monitoring.
 
-## TAG v0.1.0-RC1 (2016-12-01)
+##### TAG v0.1.0-RC1 (2016-12-01)
+[![](https://images.microbadger.com/badges/image/janus1990/docker-nginx-php:v0.1.0-RC1.svg)](https://microbadger.com/images/janus1990/docker-nginx-php:v0.1.0-RC1 "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/version/janus1990/docker-nginx-php:v0.1.0-RC1.svg)](https://microbadger.com/images/janus1990/docker-nginx-php:v0.1.0-RC1 "Get your own version badge on microbadger.com")
 
 Initial release
 - Compile Nginx v1.11.6 from source.
diff --git a/Dockerfile b/Dockerfile
index 6b8ae91..261a160 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:jessie
 
 ENV \
-    NGINX_VERSION=1.11.7 \
+    NGINX_VERSION=1.11.8 \
     PHP_VERSION=7.1.0
 
 COPY \
diff --git a/README.md b/README.md
index e3d5893..c524bcf 100644
--- a/README.md
+++ b/README.md
@@ -49,4 +49,3 @@ If you want to overwrite the default Honcho configuration - mount your custom `P
 ## Todo
 
 - Add [HEALTHCHECK](https://docs.docker.com/engine/reference/builder/#/healthcheck)
-- Add more support for composer in docker entrypoint.
diff --git a/docker-entrypoint b/docker-entrypoint
index 6345db0..a75ccf7 100644
--- a/docker-entrypoint
+++ b/docker-entrypoint
@@ -8,7 +8,6 @@
 # chown www-data:www-data /usr/local/nginx/logs/error-php.log
 
 # Update PHP composer
-# Update PHP composer to most most recent version (as of now the current version is v1.2.2).
 # By default, we will try to update to the most recent version of PHP composer.
 # However, this blocks starting the initial process IF you have a bad or no Internet connection at
 # all. To avoid this, you can start the container with SKIP_COMPOSER_UPDATE env set to 1.