Added -u option (to set good right with chown) + some old code removed