add video support + fix bugs