Re #431 Adding more fields, and more careful language handling.