more work on field set editing