fixed one problem, found another. Need to readdress the merging of
labels
fixed FSFDP test
commiting some stupid stuff that I might have to undo