Fix name in where example digram. Closes #517
Debugging: updates for 3.1 and current style