Ok, I'll make the edits as soon as I can.