made a bunch of changes

entropy calculation could still be wrong
attempt at entropy2