Minor fixes. Additional fields.