Fix some comments and futures