I loved the "prequel" scene with the hippie ... never shot.
I may have ranted one or two times about the scenes DC never shot for hoDS. (OK - so I've ranted one or two million times.) But in the case of the "hippie" sequences in the NoDS script, I actually think it was an excellent decision not to have shot them. They would have tipped the audience off way too early that Carlotta and Gerard were, well, pretty much a pair of homicidal maniacs when it came to protecting the "secrets" at Collinwood. I think it's much better that that fact evolves/reveals itself at the slower pace as edited...
As for Angelique being a witch, I've always felt that "the strange death of Reverend Herridge so soon after his sermon denoucing her," as Strack put it, wasn't merely some trumped up charge on Strack's part but was actually a plot device to more than hint that Angelique had indeed had more involvement in his death than possibly having simply wished that the reverend had minded his own business.