update demo with minor improvements