Renamed a few fields, and toyed with logger format