Continue editorial or annotations
Changed field names

rationalized field names a bit