Adding webplayer fix and some cleanup