Alrighty. I edited the OP to reflect these changes.