Small improvements - stable simulation up to this point