lots of fixes to examples...