Fixed SoftMax and added comparators