bug fixes to examples
v0.6 cleanup 1