Minor tweaks based on my experience getting up an running