fup: -tv added, cosmetic changes