Tails is moved as expected; some minor fixes.
Small fixes after vars rename.