fixed field names and units