Update: minor improvements for demo [wip]