Minor changes in switches -t and -r
bug in list that contains lists