Force field updates.  A few remaining to-do's.

Change-Id: If2bf59716d1d899aa8130ad61c02dadf05b3914c