"Final" changes

One more read through and then get to Alex?