some more futures and fixes