Entropy: Dec 7 bugfix

Ironed out the last bugs and crashes