- bug fixes in CancellableFuture
- more testing