Bunch of errors corrected

facet collapse errors corrected