More fixes and work on video