More on distro

Fixed some conflicts. This should be ok