Various edits and suggestions to be reviewed