update old & new examples to use more of Q, and make new example more comprehensive