fix error on video re-init, other cleanup