Add docker flag and address comments