Improvements for simulation

merge together with pull request in cob_simulation