Updated
Updated after John's 2nd fb.
Minor updates.