Added a few fields, cosmetic name changes.