Take into account edge orientation; small fixes to convert(face)