fixed one forward-compat bug and made cosmetic changes in examples