Core pr 5

Lots of minor fixes to make the installation run better.
So all existing instalations get it but it is optional going forward? Hm.