Expanded future work, added lots of citations, lots of other fixes