live updates from tarballs working
fixed merge conflicts