Fix tv guide, cleanup