Core pr 5

Lots of minor fixes to make the installation run better.
:+1: