Gdickinson/fail futures takeover

This PR supersedes Moses' earlier one which addresses these points. I've taken Marius' changes into consideration, modulo some formatting and minor wording cleanups.