more demo changes

seems to be ready, test a little tomorrow