revise logging, re-arrange fields