Most likely final edits

Woot.