Fixed a CM bug
Fixed an Electrode bug
Cleanup in the entity manager