Added tv4
Some things are somewhat more proper now