1. Fixed field closing tag.  2. Increased current and energy consumption field sizes.

Field size increase to accommodate kilowatt-size power trains and long missions. A more airlink economical option would be to use one scalar byte for both of the consumption fields.  However, not sure if the savings would carry their weight in added complexity.