SoftMaxTree fixes 2

This PR includes some more SoftMaxTree fixes.