Tweaks and typo fixing after walkthrough