Added stuff to Dockerfile, bugfixes