More work on quickstarts