Additional Entropy Functions

TODO: Entropy calculations are still off.