Also: * Fix wrapping in docker readme * Clean up some docs on the docker image * a workaround for #4554