refine and annotate examples (fix #24, although did not create new examples)