more quickstart tut improvements