more cleanup on redraws and video support (in progress)