Some simulations refinements implemented. No crashes but there might be
an infinite loop.
Simulation works pretty stable now. In a next step we will have to test
the new heuristic against the old one.