Updated Dockerfiles, Fixed Issues