My revisions

More to do but this is a start!