Finishing Roger's edits so far