Resolve issues from comments, fix bugs in update-demo example, rename files for clarity, add turn-down steps.