Baroque-style improvisation - any good resources?

I am a pianist and guitarist who is equally interested in Bach and jazz. Naturally, I would like to incorporate some baroque-style devices and more counterpoint into my improvisations/ arrangements. What is a good place to start? Anything besides just analysis and listening? I have been playing Bach regularly for several years and I have a decent background in theory. Thanks!