Fix new installer

only important commit is ecf57c0 rest is merge of master.