handle skips and errors better