fixed up shadow demo
merged master