I agree (on both counts).  Updated.