add rename, select -u ; tweak flags