correcting more issues in ScreenDemonstration.