Fix more of the walkthrough and add a few more pieces