Basic demo: minor improvements