General cleanup, support for TVs now working.