added fields to Response, fixed up style elsewhere