re-implement takeUntil without the onDone hack. Add skipErrors