More on distro

Bunch of changes..