commit derivations
corrected basic hard soft equations