lots of demo fixes