Rewrite pfold to fix sample counting issue & epfold to include more statistics