fixed up matrixCondition, incorporated MK's fixes to emitter