Walkthrough tweaks suggested by @caheberer