bugs, cleanup, and field name change sync