various fixes from running through the quickstart

In a branch, where things should be. Everything in its place. 

— Justin "Revert" Miller