small tweaks for first demo