Wip/installer cleanups

This makes some updates to the installer and resolves the issues we saw using it yesterday.