demosite_fresh: improvements