diff --git a/.travis.yml b/.travis.yml
index 5d9ec8e..2ed6db9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,8 +25,8 @@ before_install:
 jobs:
   include:
     - name: PyTest With Coverage
-      script: docker run -ti -v "$PWD/shared:/shared" pyghost:v1.0 bash -c "pytest --cov=./ --cov-report=xml:/shared/coverage.xml"
+      script: docker run -ti -v "$PWD/shared:/shared" -v "$PWD:/app" pyghost:v1.0 bash -c "pytest --cov=./ --cov-report=xml:/shared/coverage.xml"
 
 after_success:
   - curl -s https://codecov.io/bash | bash
-  - ./cc-test-reporter after-build -t clover -p shared --exit-code $TRAVIS_TEST_RESULT
+  - ./cc-test-reporter after-build -t clover -p shared/coverage.xml --exit-code $TRAVIS_TEST_RESULT
diff --git a/Dockerfile b/Dockerfile
index 518bce7..863f32d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,11 +3,12 @@ MAINTAINER Agnes Kis
 
 RUN mkdir /app
 WORKDIR /app
-COPY . /app
+COPY ./requirements.txt /app
 
 RUN pip install -r requirements.txt
 
 # Change from root user for security reasons
-RUN useradd -r -U -s /bin/bash pygameuser
-RUN mkdir /shared && chown -R pygameuser:pygameuser /shared /app
+RUN useradd -r -U -s /bin/bash pygameuser && usermod -u 1000 pygameuser
+RUN mkdir /shared && chown -R pygameuser:pygameuser /app /shared
+RUN echo $(id -u)
 USER pygameuser
diff --git a/README.md b/README.md
index 1098082..58e7802 100644
--- a/README.md
+++ b/README.md
@@ -35,8 +35,8 @@ docker build . -t pyghost-ubuntu:v1.0
 docker build --no-cache . -t pyghost-ubuntu:v1.0
 
 # Depending on the OS you are using sh or bash ..
-docker run -it pyghost-ubuntu:v1.0 sh
-docker run -it pyghost-ubuntu:v1.0 bash
+docker run --rm -v `pwd`:/app -it pyghost-ubuntu:v1.0 sh
+docker run --rm -v `pwd`:/app -it pyghost-ubuntu:v1.0 bash
 
 # Linux setups - might need for host display access
 # If needed for display env var: ip route list | grep default
@@ -44,8 +44,8 @@ xhost +local:docker
 
 # For GUI apps, use the host's X11 server and DISPLAY
 # https://stackoverflow.com/questions/28392949/running-chromium-inside-docker-gtk-cannot-open-display-0
-docker run --env DISPLAY=unix$DISPLAY --volume $XAUTH:/root/.Xauthority --volume /tmp/.X11-unix:/tmp/.X11-unix --rm -it pyghost-ubuntu:v1.0 bash
-docker run --env DISPLAY=unix$DISPLAY --volume $XAUTH:/root/.Xauthority --volume /tmp/.X11-unix:/tmp/.X11-unix --volume `pwd`:/app --rm -it pyghost-ubuntu:v1.0 bash
+docker run --rm --env DISPLAY=unix$DISPLAY -v $XAUTH:/root/.Xauthority -v /tmp/.X11-unix:/tmp/.X11-unix -it pyghost-ubuntu:v1.0 bash
+docker run --rm --env DISPLAY=unix$DISPLAY -v $XAUTH:/root/.Xauthority -v /tmp/.X11-unix:/tmp/.X11-unix -v `pwd`:/app -it pyghost-ubuntu:v1.0 bash
 # docker exec -it pyghost-ubuntu:v1.0 bash
 
 python run_game.py
diff --git a/entrypoint.sh b/entrypoint.sh
deleted file mode 100644
index e69de29..0000000
diff --git a/requirements.txt b/requirements.txt
index 6da5a1d..62d84eb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,3 +5,4 @@ numpy
 codecov
 coverage
 pytest-cov
+pylint