Adjustements and updates to the demo files