fix several things (demo session)