Cleanup
added
implemented video playing support