demo6 demo10 update (and bug fixes)
demo6 (revert introduced errorneous comment)