Made some fixes. Little more adaptable now.

Still need to add the meta for video URL...