Implementing comments from Gavin
Additional comments post-gavin. Some work needed for plots