email and video fixes