More work towards getting the installer wizard ready.