Consolidated Dockerfile, corrected Makefile