better type checking
Merge pull request #221 from artcompiler/youtube-working

better type checks