Some clean up and additions to walkthrough.