Future Work & other edits