Diagnostics logging

A few minor changes after testing this afternoon.