Small improvs in demo