demo bugs

Thanks. I'll have a look at these tomorrow. It's actually nice to think I'll have some more eyes on this code soon... It's a lot of work keeping up with so many examples when the changes are so fundamental.

Cheers,
Mike