Feature/upgrade guide

Couple minor tweaks from feedback from @dereklwood