Tweaks after walkthrough