More edits

Still not done.