Many bug fixes all around in preparation of the demo