few improvements in simulator