some improvements to the pipeline