This is an overhaul where the edits are now in place in light of comments, with some more details on editing files in-place.