added a lot more changes to demo files