Increased accuracy of EMC mapping and fixed all off-by-1 EMC errors