Final Edits

Hopefully...