youtubeconnector fixes and refactoring