mega cleanup and added IPTV info (if current  was a stream....)