Fixed #291 + media player fixes