expanded a few classes
started writing entropy calculation