Short fixes
Merge pull request #40 from whileyryan/feature_youtube_fixes

Short fixes