some work on fifo leaks remaining