minor demo improvements