Use improved simulator from private project

[SpaceK33z]

We have improved the simulator a lot in a private project and we need to backport it to here and make our private project use that code.

[rebane2001]

Shouldn't you open a pull request for it?

[SpaceK33z]

Still need to find the time to extract the code from our own project into here.