small updates on the demo solution