Minor rename of fields to make the json a bit clearer to read
Chained the local stack trace onto the remote one when an error occurs