Bug fixes.
Merge branch 'master' of http://github.com/nighthawk454/tv