minor changes
still broken w.r.t. 37 version of livetv version