More symlinks work and a bit of ubuntu-specific stuff