fixed sandbox mode + additional changes