Added missing fields, fixed values/labels.