some minor fixes, to make the whole demo more obvious