Rearrange and add some comments to the quickstart