Implemented 'Entropy'. Fixed implementation of 'Normal'. Added 'Binary', which is the same as 'None'.