do not forget original AND content when flattening
cleanup
also report errors of first parse phase
correcting test case graph
fix test case and better error message on join error