Demers experiment

And a few extra fixes