fixed non returning futures in detion and minor checks