diff --git a/Dockerfile b/Dockerfile
index eb10b06..58a6868 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,19 @@
 FROM ubuntu:trusty
-MAINTAINER paimpozhil@gmail.com
-RUN apt-get update -y
+MAINTAINER Sean Payne <seantpayne+docker@gmail.com>
+
 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get install -y git x11vnc wget python python-numpy unzip Xvfb firefox openbox geany
-RUN cd /root && git clone https://github.com/kanaka/noVNC.git 
+
 ADD startup.sh /startup.sh
-RUN chmod 0755 /startup.sh
+
+RUN apt-get update -y && \
+    apt-get install -y git x11vnc wget python python-numpy unzip Xvfb firefox openbox geany menu && \
+    cd /root && git clone https://github.com/kanaka/noVNC.git && \
+    cd noVNC/utils && git clone https://github.com/kanaka/websockify websockify && \
+    cd /root && \
+    chmod 0755 /startup.sh && \
+    apt-get autoclean && \
+    apt-get autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
 CMD /startup.sh
 EXPOSE 6080
diff --git a/README.md b/README.md
index ae89975..f0031a8 100644
--- a/README.md
+++ b/README.md
@@ -14,10 +14,10 @@ Especially useful if you have to give access to your friends who come over for f
 
 ## How to use
 ```
-docker run -td -p 6080:6080 paimpozhil/docker-novnc
+docker run -td -p 6080:6080 zerodivide1/docker-novnc
 
 #Or if you like to build yourself
-git clone https://github.com/paimpozhil/docker-novnc.git 
+git clone https://github.com/zerodivide1/docker-novnc.git 
 cd docker-novnc
 docker build -t novnc .
 docker run -td -p 6080:6080 novnc
@@ -43,17 +43,12 @@ apt-get commands
 
 ex: apt-get install libreoffice-base libreoffice-gtk libreoffice-calc
 
-## To DO
-
-Setup a LXDE version for a more desktop like setup
-
-Add Authentication for VNC.
-
 ## Support
 
-### http://dockerteam.com for all the docker based support.
+* http://docker.com for all the docker based support.
 
 
 ## Credits
 
-#### NoVNC http://kanaka.github.io/noVNC/
+* [NoVNC](http://kanaka.github.io/noVNC/)
+* [Original docker-novnc project](https://github.com/paimpozhil/docker-novnc)
diff --git a/startup.sh b/startup.sh
index d9efcef..05e4ea4 100644
--- a/startup.sh
+++ b/startup.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 export DISPLAY=:1
-Xvfb :1 -screen 0 1280x1024x16 &
+Xvfb :1 -screen 0 1600x900x16 &
+sleep 5
 openbox-session&
-x11vnc -display :1 -bg -nopw -listen localhost -xkb -ncache 10 -ncache_cr
-cd /root/noVNC && ./utils/launch.sh --vnc localhost:5900
+x11vnc -display :1 -nopw -listen localhost -xkb -ncache 10 -ncache_cr -forever &
+cd /root/noVNC && ln -s vnc_auto.html index.html && ./utils/launch.sh --vnc localhost:5900