sim management improvement, fix #25, #26