WIP - some corrections

Corrections in the demos mostly