Fix some typos and merge Dockerfile