As far as relative pronouns go, a little brown book insists on the comma after "which" because it usually introduces nonessential elements. It opens a relative clause that has more weight than "that."
Companion website to the Little, Brown Book
The exercises on this site are excellent!