Some more improvements to the installer (still broken)

This is untested and most likely still broken