some cleanup, fix path suffix
add 'ValuePipe.toOption' instead of toIterator