fix another format problem plus prettying up all responses