fix pre-demo bugs
6 files changed