Did Endora get REALLY mad at Samantha,(like she did in the Dick York as Darrin #1 episode "Charlie Harper-Winner",)and if so,which episodes during the Darrin #2 years?

Did Samantha ever confront a witch friend who was ,thanks to Endora,trying to steal away Darrin,as she did with Sarah Baker in the good first season episode with Dick York as Darrin "It Takes One To Know One"?

And finally,did any more of Samantha's old boyfriends make an apearance like they did in the Dick York as Darrin#1 years?

Was his Darin ever chased around by overly-amorous women,like Dick York's Darrin was in the episode"A Most Unusual Wood Nymph"-(of course,he didn't know she was a wood nymph).