Updated references and few of the demos

Beware, it's still incomplete!