Some initial edits

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Merge pull request #5007 from jamtur01/james_edits

Some initial edits