More improvements to the installer (semi broken)