pvr.tvh - lots more tidying up, this now works against XBMC 12.2