simEntity refactoring should be finished for now

also found a bug in one piece of the code due to this, it is fixed now.