safer executor behavior, fix bug with kill