Adding video dump. Plus some cleanup