add comment on QDiagram, and misc cleanup