edits/updates for move to cfv6