note fixes, new examples
merge dev