Improve demos; fix a couple of bugs.