Some more work on the installer