Improved the walkthrough nicely
Merge branch 'improve-walkthrough' into develop