fixing a lot of stuff in pipeline