Add video capture plus small changes