fixed execution bugs