Add some additional fields, cleanup previously introduced bugs, cleanup logging