Tried the quickstart and fixed minor nits