Lots of updates
Resolved merge conflict on Dockerfile.