cleanup + fix walkthrough