Refactored slightly to aid in double "whatson now" lookups.
Some corrections to channels in air tuner.
Correction to current channel handling after tuner change.