edits done, needs a final read through