demos(): polish a few things