add --include-credentials option; edits