Fixed up the response format stuff, I think, and hope.
Lots of renames and missing stuff.